diff options
Diffstat (limited to 'sysutils/portupgrade-devel')
| -rw-r--r-- | sysutils/portupgrade-devel/Makefile | 26 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/portupgrade-devel/pkg-plist | 1 |
3 files changed, 12 insertions, 20 deletions
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 6e871df7c945..16aed7712e66 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -6,28 +6,25 @@ # PORTNAME= portupgrade -PORTVERSION= 20020920 +PORTVERSION= 20020921 CATEGORIES= sysutils MASTER_SITES= http://www.iDaemons.org/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20020805 +DISTVERSION= 20020921 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} -PATCHFILES= ${DISTNAME}-20020830.diff.bz2 \ - pkgtools-20020830-20020902.diff.bz2 \ - pkgtools-20020902-${PORTVERSION}.diff.bz2 +PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif MAINTAINER= knu@FreeBSD.org -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 \ - ${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/sysutils/pkg_tarup +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} # ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb @@ -59,16 +56,15 @@ INSTALL_TARGET+= install-doc .include <bsd.port.pre.mk> -.if ${RUBY_VER} < 1.7 -RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/lang/ruby16-shim-ruby18 +# pkg_create(1) must support -b. (4.5-RELEASE or later) +# XXX: PKG_CMD is not defined yet.. +PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} +.if empty(PKG_CREATE_OK) +IGNORE= pkg_create does not support -b. Please update pkg_* tools or stick with portupgrade-20020920 + pkg_tarup-1.2_3, which work just fine .endif -pre-install: -.if !defined(NOPORTDOCS) -# Cope with a bug in CURRENT's bsd.*.mk infrastructure - ${MKDIR} ${PREFIX}/share/examples/pkgtools/bash - ${MKDIR} ${PREFIX}/share/examples/pkgtools/tcsh - ${MKDIR} ${PREFIX}/share/zsh/site-functions +.if ${RUBY_VER} < 1.7 +RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/lang/ruby16-shim-ruby18 .endif post-install: diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo index b63748de7105..9088666b9f65 100644 --- a/sysutils/portupgrade-devel/distinfo +++ b/sysutils/portupgrade-devel/distinfo @@ -1,4 +1 @@ -MD5 (pkgtools-20020805.tar.bz2) = bb5a2eda513960ffc22edcaa2c330530 -MD5 (pkgtools-20020805-20020830.diff.bz2) = 76a59579cc81dd20a4c1513f7543352e -MD5 (pkgtools-20020830-20020902.diff.bz2) = 0d6d06db366ff52041c81e61176ac4e8 -MD5 (pkgtools-20020902-20020920.diff.bz2) = c4e5fd6200ca0c53c3abcba016794f35 +MD5 (pkgtools-20020921.tar.bz2) = f2bf6c73a0d48c31ac4b86ee3b7e364e diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index ad7a0657cd33..381c951fc74d 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -31,7 +31,6 @@ etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -share/zsh/site-functions/_pkg_tarup @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true @unexec rmdir %D/share/zsh 2>/dev/null || true %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample |