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 context 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/04/11 07:25:49 sekiya Exp $
+# $NetBSD: Makefile,v 1.45 2011/04/21 17:53:26 hans Exp $
 
 DISTNAME=	abcde-2.3.99.7_p235
 PKGNAME=	abcde-2.3.99.7
@@ -10,12 +10,15 @@
 HOMEPAGE=	http://code.google.com/p/abcde/
 COMMENT=	Command-line utility to rip and encode an audio CD
 
+.include "../../mk/bsd.prefs.mk"
+
 DEPENDS+=	cd-discid>=0.7:../../audio/cd-discid
 DEPENDS+=	id3-[0-9]*:../../audio/id3
 DEPENDS+=	id3v2-[0-9]*:../../audio/id3v2
-DEPENDS+=	cdparanoia>=3.0.9.7:../../audio/cdparanoia
+.if ${OPSYS} != "SunOS"
+DEPENDS+=	cdparanoia>=>=3.0.9.7:../../audio/cdparanoia
+.endif
 DEPENDS+=	mkcue>=2.1:../../misc/mkcue
-DEPENDS+=	gsed>=4.2:../../textproc/gsed
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -23,7 +26,7 @@
 EXTRACT_SUFX=	.tar.bz2
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-USE_TOOLS+=	bash:run
+USE_TOOLS+=	bash:run gsed:run
 REPLACE_BASH=	abcde
 
 EGDIR=		${PREFIX}/share/examples/abcde
@@ -48,5 +51,17 @@
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+.if ${OPSYS} == "SunOS"
+USE_TOOLS+=	ftp:run
+
+SUBST_CLASSES+=		abcde-cdparanoia
+SUBST_STAGE.abcde-cdparanoia=	pre-configure
+SUBST_MESSAGE.abcde-cdparanoia=	Adjusting cd-paranoia command name
+SUBST_FILES.abcde-cdparanoia=	abcde abcde.conf
+SUBST_SED.abcde-cdparanoia=	-e "/CDPARANOIA=cdparanoia/s/cdparanoia/cd-paranoia/"
+
+.include "../../misc/libcdio/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.34 -r1.35 pkgsrc/audio/abcde/distinfo (expand / switch to context 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 @@
-$NetBSD: distinfo,v 1.34 2010/04/11 07:25:49 sekiya Exp $
+$NetBSD: distinfo,v 1.35 2011/04/21 17:53:26 hans Exp $
 
 SHA1 (abcde-2.3.99.7_p235.tar.bz2) = 51db5e7da9b3eda0844904ad2b9138fa97eeb254
 RMD160 (abcde-2.3.99.7_p235.tar.bz2) = bbb7116a8a06ffae6e0027e5a7524e023bfd71cf
 Size (abcde-2.3.99.7_p235.tar.bz2) = 171342 bytes
 SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
-SHA1 (patch-ac) = 28fe0fceeb0d0f0ebb1207a487db5c0d68745d98
+SHA1 (patch-ac) = b6bcd301ff64fb11e7a5bda91e13b75dea568dbc

cvs diff -r1.26 -r1.27 pkgsrc/audio/abcde/patches/Attic/patch-ac (expand / switch to context 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,4 +1,4 @@
-$NetBSD: patch-ac,v 1.26 2010/04/11 07:25:49 sekiya Exp $
+$NetBSD: patch-ac,v 1.27 2011/04/21 17:53:26 hans Exp $
 
 --- abcde.orig	2010-04-10 10:14:30.000000000 +0900
 +++ abcde	2010-04-10 18:40:03.000000000 +0900
@@ -126,5 +126,11 @@
  	OSFLAVOUR=NBSD
 +	SED=gsed
  elif [ X$(uname) = "SunOS" ] ; then
- 	HTTPGET=""
+-	HTTPGET=""
++	HTTPGET=ftp
  	MD5SUM=md5
+ 	OSFLAVOUR=SunOS
++	SED=gsed
+ else
+ 	HTTPGET=wget
+ fi