diff options
author | Alexander Leidinger <netchild@FreeBSD.org> | 2003-12-12 13:43:05 +0000 |
---|---|---|
committer | Alexander Leidinger <netchild@FreeBSD.org> | 2003-12-12 13:43:05 +0000 |
commit | 8697f3d4a92690aad3e301a6765dd61353cf249c (patch) | |
tree | 2b7ca411133d3d6893e4bea02df82523f85de272 /x11-toolkits | |
parent | - add missing file from the last update (diff) |
s/rpm2cpio/rpm2cpio.pl/ after the recent update of archivers/rpm2cpio (the
script was renamed to solve a conflict with archivers/rpm) to fix possible
build problems.
I've tested this with lang/icc. Any new errors because of this commit in
one of the modified ports may be because the ports previously may have used
rpm2cpio from archivers/rpm instead of the used {EXTRACT,BUILD}_DEPENDS
archivers/rpm2cpio.
Notes
Notes:
svn path=/head/; revision=95664
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gnome-industrial-theme/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/gtk-bluecurve-theme/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/gtk-industrial-theme/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-f10-gtk2/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-f10-pango/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-f8-gtk2/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-f8-pango/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-gtk2/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/linux-pango/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/qt-bluecurve-theme/Makefile | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/x11-toolkits/gnome-industrial-theme/Makefile b/x11-toolkits/gnome-industrial-theme/Makefile index 592b079a155c..240a49ad7696 100644 --- a/x11-toolkits/gnome-industrial-theme/Makefile +++ b/x11-toolkits/gnome-industrial-theme/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .rpm MAINTAINER= stoerte@dreamwarrior.net COMMENT= Slick GNOME2 theme from Ximian -EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libindustrial.so:${PORTSDIR}/x11-toolkits/gnome-themes-extras @@ -68,7 +68,7 @@ pre-everything:: do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ + @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ && ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \ | ${TAR} -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\ diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile index 0b58b28473f8..59df0fde7a2a 100644 --- a/x11-toolkits/gtk-bluecurve-theme/Makefile +++ b/x11-toolkits/gtk-bluecurve-theme/Makefile @@ -15,7 +15,7 @@ DISTFILES= redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm MAINTAINER= rzheka@users.sourceforge.net COMMENT= Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0 -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION} USE_GMAKE= yes @@ -46,7 +46,7 @@ pre-everything:: do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\ + @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\ then \ exit 1; \ fi diff --git a/x11-toolkits/gtk-industrial-theme/Makefile b/x11-toolkits/gtk-industrial-theme/Makefile index 6209105c7a65..f072957f555e 100644 --- a/x11-toolkits/gtk-industrial-theme/Makefile +++ b/x11-toolkits/gtk-industrial-theme/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .rpm MAINTAINER= stoerte@dreamwarrior.net COMMENT= Slick theme for GTK1 from Ximian -EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio WRKSRC= ${WRKDIR}/ximian-artwork-${PORTVERSION} USE_GMAKE= yes @@ -31,7 +31,7 @@ XIMIAN_DISTVERSION= 6.2 do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ + @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}\ | cpio -i ximian-artwork-${PORTVERSION}.tar.gz 2>/dev/null \ && ${GZIP_CMD} -dc ximian-artwork-${PORTVERSION}.tar.gz \ | tar -xf - && ${RM} ximian-artwork-${PORTVERSION}.tar.gz);\ diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile index f615ee4fc2d3..76a1d9355224 100644 --- a/x11-toolkits/linux-f10-gtk2/Makefile +++ b/x11-toolkits/linux-f10-gtk2/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= GTK+ library, version 2.X, i386 Linux binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -29,7 +29,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} -E 'locale|gtk|themes' | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile index d1573514ca31..80f22ee2efc5 100644 --- a/x11-toolkits/linux-f10-pango/Makefile +++ b/x11-toolkits/linux-f10-pango/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 pango binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \ +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat BASEVERSION= 9 @@ -27,7 +27,7 @@ pre-install: ${ECHO_CMD} etc/pango/pango.modules > ${PLIST} ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} pango | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile index f615ee4fc2d3..76a1d9355224 100644 --- a/x11-toolkits/linux-f8-gtk2/Makefile +++ b/x11-toolkits/linux-f8-gtk2/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= GTK+ library, version 2.X, i386 Linux binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -29,7 +29,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} -E 'locale|gtk|themes' | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile index d1573514ca31..80f22ee2efc5 100644 --- a/x11-toolkits/linux-f8-pango/Makefile +++ b/x11-toolkits/linux-f8-pango/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 pango binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \ +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat BASEVERSION= 9 @@ -27,7 +27,7 @@ pre-install: ${ECHO_CMD} etc/pango/pango.modules > ${PLIST} ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} pango | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index f615ee4fc2d3..76a1d9355224 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= GTK+ library, version 2.X, i386 Linux binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio BASEVERSION= 9 ONLY_FOR_ARCHS= i386 @@ -29,7 +29,7 @@ pre-install: ${RM} -rf ${WRKSRC}/tmp ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} -E 'locale|gtk|themes' | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile index d1573514ca31..80f22ee2efc5 100644 --- a/x11-toolkits/linux-pango/Makefile +++ b/x11-toolkits/linux-pango/Makefile @@ -13,7 +13,7 @@ CATEGORIES= x11-toolkits linux MAINTAINER= trevor@FreeBSD.org COMMENT= Linux/i386 pango binary -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \ +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat BASEVERSION= 9 @@ -27,7 +27,7 @@ pre-install: ${ECHO_CMD} etc/pango/pango.modules > ${PLIST} ${MKDIR} ${WRKSRC}/tmp cd ${WRKSRC}/tmp; \ - rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ + rpm2cpio.pl < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \ ${FIND} * -type f -o -type l >> ${PLIST}; \ ${FIND} -d * -type d | ${GREP} pango | \ ${SED} -e 's:^:@dirrm :' >> ${PLIST} diff --git a/x11-toolkits/qt-bluecurve-theme/Makefile b/x11-toolkits/qt-bluecurve-theme/Makefile index a94dcd776712..bfcb54a025f2 100644 --- a/x11-toolkits/qt-bluecurve-theme/Makefile +++ b/x11-toolkits/qt-bluecurve-theme/Makefile @@ -15,7 +15,7 @@ DISTFILES= redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm MAINTAINER= rzheka@users.sourceforge.net COMMENT= Bluecurve unified-look theme for QT3 from RedHat 8.0 -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio +BUILD_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio WRKSRC= ${WRKDIR}/redhat-artwork-${PORTVERSION} USE_LIBTOOL= yes @@ -32,7 +32,7 @@ THEMES_SUBDIRS = ${WRKSRC}/art/qt/Bluecurve do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @if ! (cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\ + @if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\ then \ exit 1; \ fi |