diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2012-08-26 03:15:31 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2012-08-26 03:15:31 +0000 |
| commit | a13e482eac094ce960f9139e01910000c46896c0 (patch) | |
| tree | cdbebea1005efb9ba84478cae8ce4bc131ed9c8d /ports-mgmt | |
| parent | 6232debd314c1d324093a0c7d6167e35dfe535c8 (diff) | |
| download | ports-a13e482eac094ce960f9139e01910000c46896c0.tar.gz ports-a13e482eac094ce960f9139e01910000c46896c0.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 13 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 81c2f0d6a53f..68cede26e632 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,7 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 2.4.9.7 +PORTVERSION= 2.4.9.8 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -29,12 +29,13 @@ BDB4_DESC= Use Berkeley DB >=2 CONFLICTS_INSTALL= portupgrade-devel-* +DIST_SUBDIR= ${PORTNAME} USE_BZIP2= yes USE_RUBY= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg -MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" +MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ @@ -76,6 +77,14 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 RUN_DEPENDS+= ${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2 .endif +# Need to install working script(1) +.if ${OSVERSION} < 801000 +PLIST_SUB+= SCRIPT="" +MAKE_ENV+= NEED_COMPAT_SCRIPT=yes +.else +PLIST_SUB+= SCRIPT="@comment " +.endif + pre-extract: .if exists(${RUBY_SITEARCHLIBDIR}/bdb.so) && ${PORT_OPTIONS:MBDB1} @${ECHO_MSG} "=================================================================" diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index cabdda84bd56..fd887afc9b6a 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkgtools-2.4.9.7.tar.bz2) = 9aa5eb67fc4a48d721f36491eca45d7a05760886bae768d498b962bf5fc58cd3 -SIZE (pkgtools-2.4.9.7.tar.bz2) = 80323 +SHA256 (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 3368982aa7c27aa754485f546dff7c56715423074709582bbd4705d786058529 +SIZE (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 83214 diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 5a0bea6a873f..78108c65a82d 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -26,6 +26,12 @@ sbin/portversion %%RUBY_SITELIBDIR%%/portinfo.rb %%RUBY_SITELIBDIR%%/ports.rb %%RUBY_SITELIBDIR%%/portsdb.rb +@dirrmtry %%RUBY_SITELIBDIR%% +@dirrmtry lib/ruby/site_ruby +@dirrmtry lib/ruby +%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null +%%SCRIPT%%libexec/pkgtools/script +%%SCRIPT%%@dirrm libexec/pkgtools @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf |