diff options
-rw-r--r-- | devel/hdf/Makefile | 4 | ||||
-rw-r--r-- | editors/ted/Makefile | 6 | ||||
-rw-r--r-- | games/quake3server/Makefile | 11 | ||||
-rw-r--r-- | graphics/oxygen-icons/Makefile | 4 | ||||
-rw-r--r-- | graphics/vigra/Makefile | 4 | ||||
-rw-r--r-- | lang/kaffe/Makefile.common | 4 | ||||
-rw-r--r-- | lang/mono/Makefile | 6 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile.common | 4 | ||||
-rw-r--r-- | x11/tk-BWidget/Makefile | 6 |
9 files changed, 22 insertions, 27 deletions
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile index 8fc2e839a2a..d2623ac2cc5 100644 --- a/devel/hdf/Makefile +++ b/devel/hdf/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2012/10/31 11:17:05 asau Exp $ +# $NetBSD: Makefile,v 1.38 2013/01/11 00:15:39 joerg Exp $ DISTNAME= HDF4.2r4 PKGNAME= hdf-4.2r4 PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/ -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.hdfgroup.org/products/hdf4/ diff --git a/editors/ted/Makefile b/editors/ted/Makefile index e318451015f..4f714e6b088 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2012/10/03 11:43:43 asau Exp $ +# $NetBSD: Makefile,v 1.54 2013/01/11 00:15:39 joerg Exp $ DISTNAME= ted-2.21.src PKGNAME= ${DISTNAME:S/.src//} @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ -USE_TOOLS+= gtar +USE_TOOLS+= bsdtar MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/Ted-2.21 @@ -53,7 +53,7 @@ INSTALL_TARGET= install.shared INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR} post-extract: - @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar + @cd ${WRKSRC} ; ${TOOLS_PATH.bsdtar} xf tedPackage/TedBindist.tar post-patch: @cd ${WRKSRC}/Ted ; \ diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile index 104c549ab16..4aa7dd35021 100644 --- a/games/quake3server/Makefile +++ b/games/quake3server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/06 11:54:51 asau Exp $ +# $NetBSD: Makefile,v 1.16 2013/01/11 00:15:39 joerg Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGNAME= quake3server-1.32b @@ -13,8 +13,8 @@ COMMENT= Quake III Arena Dedicated Server for Linux .include "../../games/quake3server/Makefile.common" -USE_TOOLS+= gtar -EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - +USE_TOOLS+= bsdtar +EXTRACT_CMD= ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${TOOLS_PATH.bsdtar} xzf - NO_BUILD= yes WRKSRC= ${WRKDIR} @@ -22,11 +22,6 @@ BASEDOCDIR= ${PREFIX}/share/doc/lokigames/quake3server RCD_SCRIPTS= quake3server .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "DragonFly" -# DragonFly sed(1) adds trailing newline and it confuses gzip(1). Bsdtar, -# which doesn't use gzip but zlib, extracts the archive fine though. -TOOLS_PLATFORM.gtar= /usr/bin/bsdtar -.endif SPECIAL_PERMS+= ${Q3ROOTDIR}/q3ded nobody nogroup 0500 diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile index f4704d9fd23..49d7f54b6cf 100644 --- a/graphics/oxygen-icons/Makefile +++ b/graphics/oxygen-icons/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2012/10/06 14:11:09 asau Exp $ +# $NetBSD: Makefile,v 1.19 2013/01/11 00:15:39 joerg Exp $ DISTNAME= oxygen-icons-4.8.4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE:=4.8.4/src/} EXTRACT_SUFX= .tar.xz -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar MAINTAINER= markd@NetBSD.org HOMEPAGE= http://www.kde.org/ diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 290ec7ec5de..0e9be5a9257 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/12/09 00:05:09 adam Exp $ +# $NetBSD: Makefile,v 1.20 2013/01/11 00:15:39 joerg Exp $ DISTNAME= vigra-1.9.0-src PKGNAME= ${DISTNAME:S/-src//} @@ -10,7 +10,7 @@ HOMEPAGE= http://hci.iwr.uni-heidelberg.de/vigra/ COMMENT= Computer vision library LICENSE= mit -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_CMAKE= yes diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common index d4e9e65b80d..1f471c83bdd 100644 --- a/lang/kaffe/Makefile.common +++ b/lang/kaffe/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2012/10/02 20:11:44 asau Exp $ +# $NetBSD: Makefile.common,v 1.25 2013/01/11 00:15:40 joerg Exp $ # used by lang/kaffe-x11/Makefile DISTNAME= kaffe-1.1.7 @@ -12,7 +12,7 @@ COMMENT= Virtual machine capable of running Java(tm) code DEPENDS+= jikes>=1.22:../../lang/jikes DEPENDS+= fastjar>=0.93:../../archivers/fastjar -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar GNU_CONFIGURE_PREFIX= ${JAVA_HOME} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} JAVA_HOME= ${PREFIX}/java/kaffe diff --git a/lang/mono/Makefile b/lang/mono/Makefile index a85ec9731a5..a67b4af1d17 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2012/10/21 21:21:40 wiz Exp $ +# $NetBSD: Makefile,v 1.129 2013/01/11 00:15:40 joerg Exp $ DISTNAME= mono-2.10.9 CATEGORIES= lang @@ -19,10 +19,10 @@ CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]* ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} -USE_TOOLS+= bison gmake gtar perl:run pkg-config bash:run msgfmt +USE_TOOLS+= bison gmake perl:run pkg-config bash:run msgfmt USE_LIBTOOL= yes USE_LANGUAGES+= c c++ -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index b86e9ca3f1c..c920ed82342 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2012/10/29 05:06:47 asau Exp $ +# $NetBSD: Makefile.common,v 1.35 2013/01/11 00:15:40 joerg Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -11,7 +11,7 @@ DISTNAME= qt-everywhere-opensource-src-${QTVERSION} CATEGORIES= x11 MASTER_SITES= http://releases.qt-project.org/qt4/source/ -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar .include "../../x11/qt4/Makefile.common" diff --git a/x11/tk-BWidget/Makefile b/x11/tk-BWidget/Makefile index 96ed96cf023..e22e1a0dce3 100644 --- a/x11/tk-BWidget/Makefile +++ b/x11/tk-BWidget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/29 05:06:53 asau Exp $ +# $NetBSD: Makefile,v 1.12 2013/01/11 00:15:40 joerg Exp $ DISTNAME= BWidget-1.9.0 PKGNAME= tk-${DISTNAME} @@ -20,14 +20,14 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_BUILD= YES NO_CONFIGURE= YES -USE_TOOLS+= gtar +USE_TOOLS+= bsdtar PLIST_SUBST+= BWDIR=${DISTNAME} INSTALLATION_DIRS= lib/tcl do-install: - cd ${DESTDIR}${PREFIX}/lib/tcl && ${GTAR} zxpf ${DISTDIR}/${DISTFILES:Q} --exclude=CVS + cd ${DESTDIR}${PREFIX}/lib/tcl && ${TOOLS_PATH.bsdtar} zxpf ${DISTDIR}/${DISTFILES:Q} --exclude=CVS ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/lib/tcl/${DISTNAME} .include "../../mk/bsd.pkg.mk" |