Thu Apr 21 17:53:27 2011 UTC ()
Make this work on SunOS.

audio/cdparanoia is not available for SunOS, but devel/libcdio has a
working alternative. Also, don't depend on gsed directly, add it to
USE_TOOLS.


(hans)
diff -r1.44 -r1.45 pkgsrc/audio/abcde/Makefile
diff -r1.34 -r1.35 pkgsrc/audio/abcde/distinfo
diff -r1.26 -r1.27 pkgsrc/audio/abcde/patches/patch-ac
cvs diff -r1.44 -r1.45 pkgsrc/audio/abcde/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/abcde/Makefile 2010/04/11 07:25:49 1.44
+++ pkgsrc/audio/abcde/Makefile 2011/04/21 17:53:26 1.45
@@ -1,52 +1,67 @@ @@ -1,52 +1,67 @@
1# $NetBSD: Makefile,v 1.44 2010/04/11 07:25:49 sekiya Exp $ 1# $NetBSD: Makefile,v 1.45 2011/04/21 17:53:26 hans Exp $
2 2
3DISTNAME= abcde-2.3.99.7_p235 3DISTNAME= abcde-2.3.99.7_p235
4PKGNAME= abcde-2.3.99.7 4PKGNAME= abcde-2.3.99.7
5#PKGREVISION= 0 5#PKGREVISION= 0
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/} 7MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
8 8
9MAINTAINER= sekiya@NetBSD.org 9MAINTAINER= sekiya@NetBSD.org
10HOMEPAGE= http://code.google.com/p/abcde/ 10HOMEPAGE= http://code.google.com/p/abcde/
11COMMENT= Command-line utility to rip and encode an audio CD 11COMMENT= Command-line utility to rip and encode an audio CD
12 12
 13.include "../../mk/bsd.prefs.mk"
 14
13DEPENDS+= cd-discid>=0.7:../../audio/cd-discid 15DEPENDS+= cd-discid>=0.7:../../audio/cd-discid
14DEPENDS+= id3-[0-9]*:../../audio/id3 16DEPENDS+= id3-[0-9]*:../../audio/id3
15DEPENDS+= id3v2-[0-9]*:../../audio/id3v2 17DEPENDS+= id3v2-[0-9]*:../../audio/id3v2
16DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia 18.if ${OPSYS} != "SunOS"
 19DEPENDS+= cdparanoia>=>=3.0.9.7:../../audio/cdparanoia
 20.endif
17DEPENDS+= mkcue>=2.1:../../misc/mkcue 21DEPENDS+= mkcue>=2.1:../../misc/mkcue
18DEPENDS+= gsed>=4.2:../../textproc/gsed 
19 22
20PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
21 24
22NO_BUILD= yes 25NO_BUILD= yes
23EXTRACT_SUFX= .tar.bz2 26EXTRACT_SUFX= .tar.bz2
24WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 27WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
25 28
26USE_TOOLS+= bash:run 29USE_TOOLS+= bash:run gsed:run
27REPLACE_BASH= abcde 30REPLACE_BASH= abcde
28 31
29EGDIR= ${PREFIX}/share/examples/abcde 32EGDIR= ${PREFIX}/share/examples/abcde
30 33
31MESSAGE_SUBST+= EGDIR=${EGDIR} 34MESSAGE_SUBST+= EGDIR=${EGDIR}
32MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 35MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
33 36
34INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 37INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
35 38
36SUBST_CLASSES+= abcde 39SUBST_CLASSES+= abcde
37SUBST_STAGE.abcde= pre-configure 40SUBST_STAGE.abcde= pre-configure
38SUBST_MESSAGE.abcde= Adjusting the directory for configuration files 41SUBST_MESSAGE.abcde= Adjusting the directory for configuration files
39SUBST_FILES.abcde= abcde abcde.1 42SUBST_FILES.abcde= abcde abcde.1
40SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g" 43SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g"
41 44
42do-install: 45do-install:
43 ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin 46 ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
44 ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin 47 ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
45 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 48 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
46 ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR} 49 ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
47 ${INSTALL_MAN} ${WRKSRC}/abcde.1 \ 50 ${INSTALL_MAN} ${WRKSRC}/abcde.1 \
48 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 51 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
49 ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \ 52 ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
50 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 53 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
51 54
 55.if ${OPSYS} == "SunOS"
 56USE_TOOLS+= ftp:run
 57
 58SUBST_CLASSES+= abcde-cdparanoia
 59SUBST_STAGE.abcde-cdparanoia= pre-configure
 60SUBST_MESSAGE.abcde-cdparanoia= Adjusting cd-paranoia command name
 61SUBST_FILES.abcde-cdparanoia= abcde abcde.conf
 62SUBST_SED.abcde-cdparanoia= -e "/CDPARANOIA=cdparanoia/s/cdparanoia/cd-paranoia/"
 63
 64.include "../../misc/libcdio/buildlink3.mk"
 65.endif
 66
52.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.35 pkgsrc/audio/abcde/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/abcde/distinfo 2010/04/11 07:25:49 1.34
+++ pkgsrc/audio/abcde/distinfo 2011/04/21 17:53:26 1.35
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.34 2010/04/11 07:25:49 sekiya Exp $ 1$NetBSD: distinfo,v 1.35 2011/04/21 17:53:26 hans Exp $
2 2
3SHA1 (abcde-2.3.99.7_p235.tar.bz2) = 51db5e7da9b3eda0844904ad2b9138fa97eeb254 3SHA1 (abcde-2.3.99.7_p235.tar.bz2) = 51db5e7da9b3eda0844904ad2b9138fa97eeb254
4RMD160 (abcde-2.3.99.7_p235.tar.bz2) = bbb7116a8a06ffae6e0027e5a7524e023bfd71cf 4RMD160 (abcde-2.3.99.7_p235.tar.bz2) = bbb7116a8a06ffae6e0027e5a7524e023bfd71cf
5Size (abcde-2.3.99.7_p235.tar.bz2) = 171342 bytes 5Size (abcde-2.3.99.7_p235.tar.bz2) = 171342 bytes
6SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc 6SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
7SHA1 (patch-ac) = 28fe0fceeb0d0f0ebb1207a487db5c0d68745d98 7SHA1 (patch-ac) = b6bcd301ff64fb11e7a5bda91e13b75dea568dbc
cvs diff -r1.26 -r1.27 pkgsrc/audio/abcde/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/abcde/patches/Attic/patch-ac 2010/04/11 07:25:49 1.26
+++ pkgsrc/audio/abcde/patches/Attic/patch-ac 2011/04/21 17:53:26 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.26 2010/04/11 07:25:49 sekiya Exp $ 1$NetBSD: patch-ac,v 1.27 2011/04/21 17:53:26 hans Exp $
2 2
3--- abcde.orig 2010-04-10 10:14:30.000000000 +0900 3--- abcde.orig 2010-04-10 10:14:30.000000000 +0900
4+++ abcde 2010-04-10 18:40:03.000000000 +0900 4+++ abcde 2010-04-10 18:40:03.000000000 +0900
5@@ -415,10 +415,10 @@ 5@@ -415,10 +415,10 @@
6 { 6 {
7 case $1 in 7 case $1 in
8 TRACKNAME1) 8 TRACKNAME1)
9- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" 9- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
10+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')" 10+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
11 ;; 11 ;;
12 TRACKNAME) 12 TRACKNAME)
13- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" 13- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
14+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')" 14+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
@@ -116,15 +116,21 @@ $NetBSD: patch-ac,v 1.26 2010/04/11 07:2 @@ -116,15 +116,21 @@ $NetBSD: patch-ac,v 1.26 2010/04/11 07:2
116  116
117+# We need GNU sed 117+# We need GNU sed
118+SED=sed 118+SED=sed
119+ 119+
120 # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for 120 # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
121 # Linux/OpenBSD. ftp is user for NetBSD. 121 # Linux/OpenBSD. ftp is user for NetBSD.
122 # Let's use these checkings to determine the OS flavour, which will be used 122 # Let's use these checkings to determine the OS flavour, which will be used
123@@ -3060,6 +3063,7 @@ 123@@ -3060,6 +3063,7 @@
124 HTTPGET=ftp 124 HTTPGET=ftp
125 MD5SUM=md5 125 MD5SUM=md5
126 OSFLAVOUR=NBSD 126 OSFLAVOUR=NBSD
127+ SED=gsed 127+ SED=gsed
128 elif [ X$(uname) = "SunOS" ] ; then 128 elif [ X$(uname) = "SunOS" ] ; then
129 HTTPGET="" 129- HTTPGET=""
 130+ HTTPGET=ftp
130 MD5SUM=md5 131 MD5SUM=md5
 132 OSFLAVOUR=SunOS
 133+ SED=gsed
 134 else
 135 HTTPGET=wget
 136 fi