[Midnightbsd-cvs] mports [18474] trunk/sysutils/cdrdao: update plist

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 29 13:25:03 EDT 2015


Revision: 18474
          http://svnweb.midnightbsd.org/mports/?rev=18474
Author:   laffer1
Date:     2015-03-29 13:25:02 -0400 (Sun, 29 Mar 2015)
Log Message:
-----------
update plist

Modified Paths:
--------------
    trunk/sysutils/cdrdao/Makefile
    trunk/sysutils/cdrdao/distinfo
    trunk/sysutils/cdrdao/pkg-plist

Modified: trunk/sysutils/cdrdao/Makefile
===================================================================
--- trunk/sysutils/cdrdao/Makefile	2015-03-29 17:22:31 UTC (rev 18473)
+++ trunk/sysutils/cdrdao/Makefile	2015-03-29 17:25:02 UTC (rev 18474)
@@ -3,6 +3,7 @@
 
 PORTNAME?=	cdrdao
 PORTVERSION=	1.2.3
+PORTREVISION?=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	cdrdao/cdrdao/${PORTVERSION}
@@ -10,30 +11,39 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT?=	Record CD-R[W]s in disk-at-once mode
+
 LICENSE=	gpl2
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		alias gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
-MP3OGG_LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
-			mad.2:${PORTSDIR}/audio/libmad \
-			vorbis.4:${PORTSDIR}/audio/libvorbis
+MP3OGG_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
+			libmad.so:${PORTSDIR}/audio/libmad \
+			libvorbis.so:${PORTSDIR}/audio/libvorbis
 
+.if ${PORTNAME} == "cdrdao"
+OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
+
+OPTIONS_DEFAULT=	MP3OGG
+MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
+TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
+
+.include <bsd.mport.options.mk>
+.endif
+
 .if ${PORTNAME} == "gcdmaster"
-USE_GNOME=		gnomehier pkgconfig
+USES+=			pkgconfig shared-mime-info
+WANT_GNOME=		yes
 GCONF_SCHEMAS=		gcdmaster.schemas
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS} \
-			gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
+			libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
 RUN_DEPENDS+=		${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
 			${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
-MAN1=			gcdmaster.1
 CONFIGURE_ARGS+=	--with-lame=no
 .else
-MAN1=			cdrdao.1 cue2toc.1 toc2cddb.1 toc2cue.1
 CONFIGURE_ARGS+=	--with-xdao=no
-.if defined(WITH_TOC2MP3)
-LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
+.if ${PORT_OPTIONS:MTOC2MP3}
+LIB_DEPENDS+=		libmp3lame.so:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-include=${LOCALBASE}/include \
 			--with-lame-lib=${LOCALBASE}/lib
 PLIST_SUB+=		TOC2MP3=""
@@ -41,8 +51,8 @@
 CONFIGURE_ARGS+=	--with-lame=no
 PLIST_SUB+=		TOC2MP3="@comment "
 .endif
-.if !defined(WITHOUT_MP3OGG)
-USE_GNOME=		pkgconfig
+.if ${PORT_OPTIONS:MMP3OGG}
+USES+=			pkgconfig
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS}
 CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
 			AO_LIBS="-L${LOCALBASE}/lib -lao" \
@@ -62,24 +72,8 @@
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
-.if ${PORTNAME} != "gcdmaster" && \
-	(!defined(WITH_TOC2MP3) || !defined(WITHOUT_MP3OGG))
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build option(s):"
-	@${ECHO_MSG} ""
-.if !defined(WITH_TOC2MP3)
-	@${ECHO_MSG} "WITH_TOC2MP3=yes	builds with toc2mp3 (requires audio/lame)"
-.endif
-.if !defined(WITHOUT_MP3OGG)
-	@${ECHO_MSG} "WITHOUT_MP3OGG=yes	builds without support for decoding MP3 and Ogg Vorbis"
-	@${ECHO_MSG} "			files (not required unless using sysutils/gcdmaster;"
-	@${ECHO_MSG} "			disabling saves a couple of dependencies)"
-.endif
-	@${ECHO_MSG} ""
-.endif
-
 post-extract:
+	@(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-midnightbsd.id)
 .if ${SCSILIBTARGET} != "i386-freebsd-cc"
 	@${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
 		${WRKSRC}/scsilib/RULES/${SCSILIBTARGET}.rul
@@ -121,46 +115,53 @@
 .if ${PORTNAME} == "gcdmaster"
 	@${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
-		${PREFIX}/man/man1/gcdmaster.1
+		${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \
-		${LOCALBASE}/share/pixmaps/document-icons
+		${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/application-registry
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \
-		${LOCALBASE}/share/application-registry
+		${STAGEDIR}${LOCALBASE}/share/application-registry
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
-		${LOCALBASE}/share/applications
+		${STAGEDIR}${LOCALBASE}/share/applications
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \
-		${LOCALBASE}/share/mime-info
+		${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \
-		${LOCALBASE}/share/mime-info
+		${STAGEDIR}${LOCALBASE}/share/mime-info
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
-		${LOCALBASE}/share/pixmaps
+		${STAGEDIR}${LOCALBASE}/share/pixmaps
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.schemas \
-		${LOCALBASE}/etc/gconf/schemas
+		${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime/packages
 	@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
-		${LOCALBASE}/share/mime/packages
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${DATADIR}
+		${STAGEDIR}${LOCALBASE}/share/mime/packages
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade \
+		${STAGEDIR}${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade \
+		${STAGEDIR}${DATADIR}
 .else
-	@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${PREFIX}/man/man1/cdrdao.1
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${PREFIX}/man/man1
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${PREFIX}/man/man1
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers
-.if defined(WITH_TOC2MP3)
-	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \
+		${STAGEDIR}${PREFIX}/man/man1/cdrdao.1
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers \
+		${STAGEDIR}${DATADIR}/drivers
+.if ${PORT_OPTIONS:MTOC2MP3}
+	@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}${PREFIX}/bin
 .endif
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in CREDITS ChangeLog README README.PlexDAE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-.endif
 
 .include <bsd.port.post.mk>

Modified: trunk/sysutils/cdrdao/distinfo
===================================================================
--- trunk/sysutils/cdrdao/distinfo	2015-03-29 17:22:31 UTC (rev 18473)
+++ trunk/sysutils/cdrdao/distinfo	2015-03-29 17:25:02 UTC (rev 18474)
@@ -1,3 +1,2 @@
 SHA256 (cdrdao-1.2.3.tar.bz2) = 8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e
-RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
 SIZE (cdrdao-1.2.3.tar.bz2) = 1428695

Modified: trunk/sysutils/cdrdao/pkg-plist
===================================================================
--- trunk/sysutils/cdrdao/pkg-plist	2015-03-29 17:22:31 UTC (rev 18473)
+++ trunk/sysutils/cdrdao/pkg-plist	2015-03-29 17:25:02 UTC (rev 18474)
@@ -4,10 +4,12 @@
 bin/toc2cue
 %%TOC2MP3%%bin/toc2mp3
 @unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
+man/man1/cdrdao.1.gz
+man/man1/cue2toc.1.gz
+man/man1/toc2cddb.1.gz
+man/man1/toc2cue.1.gz
 %%DATADIR%%/drivers
- at dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



More information about the Midnightbsd-cvs mailing list