diff options
author | hans <hans@pkgsrc.org> | 2011-05-11 10:28:08 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2011-05-11 10:28:08 +0000 |
commit | 30ce817327a9854f9a18505521cfd857c85ccf57 (patch) | |
tree | c9af3744c12bd799e03f3161709b1ebdae123c8b | |
parent | 83a683d86781a86c740af6561c913fbb11f1ab65 (diff) | |
download | pkgsrc-30ce817327a9854f9a18505521cfd857c85ccf57.tar.gz |
Fix gsed dependency on NetBSD. Use TOOLS_PATH.gsed to find gsed.
-rw-r--r-- | audio/abcde/Makefile | 12 | ||||
-rw-r--r-- | audio/abcde/distinfo | 4 | ||||
-rw-r--r-- | audio/abcde/patches/patch-ac | 8 |
3 files changed, 17 insertions, 7 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index c66606c7cde..9508062b3e7 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2011/04/24 16:17:53 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2011/05/11 10:28:08 hans Exp $ DISTNAME= abcde-2.3.99.7_p235 PKGNAME= abcde-2.3.99.7 @@ -42,6 +42,12 @@ SUBST_MESSAGE.abcde= Adjusting the directory for configuration files SUBST_FILES.abcde= abcde abcde.1 SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g" +SUBST_CLASSES+= gsed +SUBST_STAGE.gsed= pre-configure +SUBST_MESSAGE.gsed= Adjusting gsed path +SUBST_FILES.gsed= abcde +SUBST_SED.gsed= -e "s,@TOOLS_GSED@,${TOOLS_PATH.gsed},g" + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin @@ -52,6 +58,10 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.if ${OPSYS} == "NetBSD" +TOOLS_PLATFORM.gsed= # empty +.endif + .if ${OPSYS} == "SunOS" USE_TOOLS+= ftp:run diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo index 8c69798b41d..5a93c3fdb52 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.35 2011/04/21 17:53:26 hans Exp $ +$NetBSD: distinfo,v 1.36 2011/05/11 10:28:08 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) = b6bcd301ff64fb11e7a5bda91e13b75dea568dbc +SHA1 (patch-ac) = c10192d56b3e73a0dc6fc7b1b192ff50cf0555ca diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index c2acf8020ff..7ba26e75705 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.27 2011/04/21 17:53:26 hans Exp $ +$NetBSD: patch-ac,v 1.28 2011/05/11 10:28:08 hans Exp $ --- abcde.orig 2010-04-10 10:14:30.000000000 +0900 +++ abcde 2010-04-10 18:40:03.000000000 +0900 @@ -120,17 +120,17 @@ $NetBSD: patch-ac,v 1.27 2011/04/21 17:53:26 hans Exp $ # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for # Linux/OpenBSD. ftp is user for NetBSD. # Let's use these checkings to determine the OS flavour, which will be used -@@ -3060,6 +3063,7 @@ +@@ -3060,10 +3063,12 @@ HTTPGET=ftp MD5SUM=md5 OSFLAVOUR=NBSD -+ SED=gsed ++ SED=@TOOLS_GSED@ elif [ X$(uname) = "SunOS" ] ; then - HTTPGET="" + HTTPGET=ftp MD5SUM=md5 OSFLAVOUR=SunOS -+ SED=gsed ++ SED=@TOOLS_GSED@ else HTTPGET=wget fi |