Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2013 14:37:53 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330876 - head/multimedia/lxdvdrip
Message-ID:  <201310191437.r9JEbrC3085679@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Oct 19 14:37:53 2013
New Revision: 330876
URL: http://svnweb.freebsd.org/changeset/ports/330876

Log:
  Enable stage
  Cleanup a bit

Modified:
  head/multimedia/lxdvdrip/Makefile
  head/multimedia/lxdvdrip/pkg-plist

Modified: head/multimedia/lxdvdrip/Makefile
==============================================================================
--- head/multimedia/lxdvdrip/Makefile	Sat Oct 19 14:29:19 2013	(r330875)
+++ head/multimedia/lxdvdrip/Makefile	Sat Oct 19 14:37:53 2013	(r330876)
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Command Line Tool to make a copy from a Video DVD
 
-LIB_DEPENDS=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav \
-		dvdread.4:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav \
+		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
@@ -41,14 +41,10 @@ LXDVDRIPSRC=	cputest.c \
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm
 
-PORTDOCS=	Changelog.de Changelog.en Changelog.fr \
+DOCS=	Changelog.de Changelog.en Changelog.fr \
 		README.de  README.en README.fr \
 		README.dvdwizard.DE README.dvdwizard.EN README.dvdwizard.FR \
 		TODO freebsd.doc
-MAN1=		lxdvdrip.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -73,34 +69,24 @@ post-patch:
 
 do-install:
 .for f in lxdvdrip lxac3scan
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/lxdvdrip.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf.sample
-.if !exists(${PREFIX}/etc/lxdvdrip.conf)
-	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${PREFIX}/etc/lxdvdrip.conf
-.endif
+	${INSTALL_MAN} ${WRKSRC}/lxdvdrip.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.EN ${STAGEDIR}${PREFIX}/etc/lxdvdrip.conf.sample
 # binaries
-	${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps_${PORTNAME} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/vamps/play_cell_${PORTNAME} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dvdbackup/dvdbackup_${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/vamps/vamps_${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/vamps/play_cell_${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dvdbackup/dvdbackup_${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 # examples
-	@${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in lxdvdrip.conf.DE lxdvdrip.conf.EN lxdvdrip.conf.FR
-	${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 # data
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.wav ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.wav ${STAGEDIR}${DATADIR}
 # docs
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc-pak/${f} ${DOCSDIR}
-.endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc-pak ; ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/lxdvdrip/pkg-plist
==============================================================================
--- head/multimedia/lxdvdrip/pkg-plist	Sat Oct 19 14:29:19 2013	(r330875)
+++ head/multimedia/lxdvdrip/pkg-plist	Sat Oct 19 14:37:53 2013	(r330876)
@@ -10,5 +10,18 @@ etc/lxdvdrip.conf.sample
 %%EXAMPLESDIR%%/lxdvdrip.conf.DE
 %%EXAMPLESDIR%%/lxdvdrip.conf.EN
 %%EXAMPLESDIR%%/lxdvdrip.conf.FR
+man/man1/lxdvdrip.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.de
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.en
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.fr
+%%PORTDOCS%%%%DOCSDIR%%/README.de
+%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.DE
+%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.EN
+%%PORTDOCS%%%%DOCSDIR%%/README.dvdwizard.FR
+%%PORTDOCS%%%%DOCSDIR%%/README.en
+%%PORTDOCS%%%%DOCSDIR%%/README.fr
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/freebsd.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310191437.r9JEbrC3085679>