diff options
| -rw-r--r-- | ports-mgmt/pkg_install/Makefile | 13 | ||||
| -rw-r--r-- | ports-mgmt/pkg_install/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/pkg_install/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/pkg_install/distinfo | 4 |
4 files changed, 26 insertions, 8 deletions
diff --git a/ports-mgmt/pkg_install/Makefile b/ports-mgmt/pkg_install/Makefile index 870d0673579..6cfe447fea7 100644 --- a/ports-mgmt/pkg_install/Makefile +++ b/ports-mgmt/pkg_install/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pkg_install -PORTVERSION= 20040416 +PORTVERSION= 20040530 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.FreeBSD.org/~marcus/ @@ -22,6 +22,8 @@ MAN1= pkg_add.1 pkg_create.1 pkg_delete.1 \ MAKE_ARGS= -DNOOBJ -DNOCRYPT -DNO_OPENSSL +PKG_FILES= main.c perform.c pkg_add.1 + .include <bsd.port.pre.mk> .if ${OSVERSION} < 460102 @@ -46,11 +48,18 @@ pre-configure: -e 's,%%MANPREFIX%%,${MANPREFIX},g' \ ${FILESDIR}/Makefile.inc > ${WRKDIR}/Makefile.inc -.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 ) post-patch: +.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 ) @${FIND} ${WRKSRC} -name '*.c' \ | ${XARGS} ${PERL} -pi.orig -e 's/__FBSDID\(("[^"]*")\)/static const char rcsid[] = $$1/' .endif +.if ${OSVERSION} < 500039 +.for i in ${PKG_FILES} + @${SED} -e 's,\.tbz,.tgz,g' ${WRKSRC}/add/${i} > \ + ${WRKSRC}/add/${i}.bak + @${MV} -f ${WRKSRC}/add/${i}.bak ${WRKSRC}/add/${i} +.endfor +.endif deinstall: @if ${PKG_INFO} -e ${PKGNAME}; then \ diff --git a/ports-mgmt/pkg_install/distinfo b/ports-mgmt/pkg_install/distinfo index 30aadd760de..e6af00fca99 100644 --- a/ports-mgmt/pkg_install/distinfo +++ b/ports-mgmt/pkg_install/distinfo @@ -1,2 +1,2 @@ -MD5 (pkg_install-20040416.tar.gz) = 4c8a5601feb15ee7bac3070bc4a0f992 -SIZE (pkg_install-20040416.tar.gz) = 84608 +MD5 (pkg_install-20040530.tar.gz) = f2a54d1450744592aadbd8b705938412 +SIZE (pkg_install-20040530.tar.gz) = 83373 diff --git a/sysutils/pkg_install/Makefile b/sysutils/pkg_install/Makefile index 870d0673579..6cfe447fea7 100644 --- a/sysutils/pkg_install/Makefile +++ b/sysutils/pkg_install/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pkg_install -PORTVERSION= 20040416 +PORTVERSION= 20040530 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.FreeBSD.org/~marcus/ @@ -22,6 +22,8 @@ MAN1= pkg_add.1 pkg_create.1 pkg_delete.1 \ MAKE_ARGS= -DNOOBJ -DNOCRYPT -DNO_OPENSSL +PKG_FILES= main.c perform.c pkg_add.1 + .include <bsd.port.pre.mk> .if ${OSVERSION} < 460102 @@ -46,11 +48,18 @@ pre-configure: -e 's,%%MANPREFIX%%,${MANPREFIX},g' \ ${FILESDIR}/Makefile.inc > ${WRKDIR}/Makefile.inc -.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 ) post-patch: +.if ${OSVERSION} < 440001 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500024 ) @${FIND} ${WRKSRC} -name '*.c' \ | ${XARGS} ${PERL} -pi.orig -e 's/__FBSDID\(("[^"]*")\)/static const char rcsid[] = $$1/' .endif +.if ${OSVERSION} < 500039 +.for i in ${PKG_FILES} + @${SED} -e 's,\.tbz,.tgz,g' ${WRKSRC}/add/${i} > \ + ${WRKSRC}/add/${i}.bak + @${MV} -f ${WRKSRC}/add/${i}.bak ${WRKSRC}/add/${i} +.endfor +.endif deinstall: @if ${PKG_INFO} -e ${PKGNAME}; then \ diff --git a/sysutils/pkg_install/distinfo b/sysutils/pkg_install/distinfo index 30aadd760de..e6af00fca99 100644 --- a/sysutils/pkg_install/distinfo +++ b/sysutils/pkg_install/distinfo @@ -1,2 +1,2 @@ -MD5 (pkg_install-20040416.tar.gz) = 4c8a5601feb15ee7bac3070bc4a0f992 -SIZE (pkg_install-20040416.tar.gz) = 84608 +MD5 (pkg_install-20040530.tar.gz) = f2a54d1450744592aadbd8b705938412 +SIZE (pkg_install-20040530.tar.gz) = 83373 |