From 128460e57cc9ab1b02bd771567fdbae3760b48ef Mon Sep 17 00:00:00 2001 From: Florent Thoumie Date: Mon, 29 May 2006 17:45:34 +0000 Subject: - Convert to USE_LDCONFIG. PR: ports/93186 Submitted by: $self Approved by: maintainer --- sysutils/portupgrade-devel/Makefile | 10 +++++++--- sysutils/portupgrade-devel/files/patch-etc_Makefile | 19 +++++++++++++++++++ sysutils/portupgrade-devel/pkg-plist | 4 +--- sysutils/portupgrade/Makefile | 10 +++++++--- sysutils/portupgrade/files/patch-etc_Makefile | 19 +++++++++++++++++++ sysutils/portupgrade/pkg-plist | 4 +--- 6 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 sysutils/portupgrade-devel/files/patch-etc_Makefile create mode 100644 sysutils/portupgrade/files/patch-etc_Makefile (limited to 'sysutils') diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile index 9e95e5d7da78..6fdba0333e18 100644 --- a/sysutils/portupgrade-devel/Makefile +++ b/sysutils/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ @@ -27,12 +27,15 @@ PATCH_DIST_STRIP= -p1 OPTIONS= BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off -USE_RC_SUBR= yes USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg +USE_LDCONFIG= ${PREFIX}/lib/compat/pkg + MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ @@ -57,6 +60,7 @@ INSTALL_TARGET+= install-doc .endif .include +.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -72,7 +76,7 @@ PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif -post-install: +post-install: install-ldconfig-file if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi diff --git a/sysutils/portupgrade-devel/files/patch-etc_Makefile b/sysutils/portupgrade-devel/files/patch-etc_Makefile new file mode 100644 index 000000000000..0bdce56bc29c --- /dev/null +++ b/sysutils/portupgrade-devel/files/patch-etc_Makefile @@ -0,0 +1,19 @@ +--- etc/Makefile.orig Sat Feb 11 16:39:34 2006 ++++ etc/Makefile Sat Feb 11 16:39:49 2006 +@@ -2,15 +2,9 @@ + + ETCDIR?= ${PREFIX}/etc + +-SCRIPTSDIR?= ${ETCDIR}/rc.d +- + BUILDDIR= .build + +-SCRIPTS= ${BUILDDIR}/pkgtools.sh \ +- ${BUILDDIR}/status-pkg.sh +- +-SCRIPTSDIR_pkgtools.sh= ${ETCDIR}/rc.d +-SCRIPTSNAME_pkgtools.sh= 000.pkgtools.sh ++SCRIPTS= ${BUILDDIR}/status-pkg.sh + + #SCRIPTSDIR_status-pkg.sh= /etc/periodic/weekly + #SCRIPTSNAME_status-pkg.sh= 400.status-pkg.sh diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index a6d56a4d879e..68369ca611bd 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -1,7 +1,5 @@ -etc/rc.d/000.pkgtools.sh @exec /bin/mkdir -p %D/lib/compat/pkg -@dirrmtry lib/compat/pkg -@dirrmtry lib/compat +@unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile index 9e95e5d7da78..6fdba0333e18 100644 --- a/sysutils/portupgrade/Makefile +++ b/sysutils/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ @@ -27,12 +27,15 @@ PATCH_DIST_STRIP= -p1 OPTIONS= BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off -USE_RC_SUBR= yes USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg +USE_LDCONFIG= ${PREFIX}/lib/compat/pkg + MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ @@ -57,6 +60,7 @@ INSTALL_TARGET+= install-doc .endif .include +.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} @@ -72,7 +76,7 @@ PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif -post-install: +post-install: install-ldconfig-file if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi diff --git a/sysutils/portupgrade/files/patch-etc_Makefile b/sysutils/portupgrade/files/patch-etc_Makefile new file mode 100644 index 000000000000..0bdce56bc29c --- /dev/null +++ b/sysutils/portupgrade/files/patch-etc_Makefile @@ -0,0 +1,19 @@ +--- etc/Makefile.orig Sat Feb 11 16:39:34 2006 ++++ etc/Makefile Sat Feb 11 16:39:49 2006 +@@ -2,15 +2,9 @@ + + ETCDIR?= ${PREFIX}/etc + +-SCRIPTSDIR?= ${ETCDIR}/rc.d +- + BUILDDIR= .build + +-SCRIPTS= ${BUILDDIR}/pkgtools.sh \ +- ${BUILDDIR}/status-pkg.sh +- +-SCRIPTSDIR_pkgtools.sh= ${ETCDIR}/rc.d +-SCRIPTSNAME_pkgtools.sh= 000.pkgtools.sh ++SCRIPTS= ${BUILDDIR}/status-pkg.sh + + #SCRIPTSDIR_status-pkg.sh= /etc/periodic/weekly + #SCRIPTSNAME_status-pkg.sh= 400.status-pkg.sh diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index a6d56a4d879e..68369ca611bd 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/portupgrade/pkg-plist @@ -1,7 +1,5 @@ -etc/rc.d/000.pkgtools.sh @exec /bin/mkdir -p %D/lib/compat/pkg -@dirrmtry lib/compat/pkg -@dirrmtry lib/compat +@unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true sbin/pkg_deinstall sbin/pkg_fetch sbin/pkg_glob -- cgit v1.2.3