diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-02-12 16:46:23 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-02-12 16:46:23 +0000 |
| commit | af13aa1d5ade82c77983431447fe548a4a2a8b03 (patch) | |
| tree | 67d9a52057aeec6fe5dea083c10d121698bcf41e /ports-mgmt | |
| parent | Update to 0.16.002 (diff) | |
- Simplify ldconfig handling
Notes
Notes:
svn path=/head/; revision=228123
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index 8131c536495b..4a6d28c65600 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -25,7 +25,6 @@ USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_LDCONFIG= ${PREFIX}/lib/compat/pkg -LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" @@ -55,7 +54,6 @@ INSTALL_TARGET+= install-doc .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash} @@ -84,7 +82,7 @@ pre-extract: @exit 1 .endif -post-install: install-ldconfig-file +post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 549455c220ef..db0dfd945758 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -26,7 +26,6 @@ USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_LDCONFIG= ${PREFIX}/lib/compat/pkg -LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" @@ -56,7 +55,6 @@ INSTALL_TARGET+= install-doc .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash} @@ -85,7 +83,7 @@ pre-extract: @exit 1 .endif -post-install: install-ldconfig-file +post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi |