ports/93186: ports/sysutils/portupgrade - use new USE_LDCONFIG option to replace 000.pkgtools.sh

[Florent Thoumie]

>Number:         93186
>Category:       ports
>Synopsis:       ports/sysutils/portupgrade - use new USE_LDCONFIG option to replace 000.pkgtools.sh
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 11 15:50:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Florent Thoumie
>Release:        FreeBSD 6.0-RELEASE amd64
>Organization:
Xbsd.org
>Environment:
System: FreeBSD cream.xbsd.org 6.0-RELEASE FreeBSD 6.0-RELEASE #4: Mon Dec 5 02:31:46 UTC 2005 root at cream.xbsd.org:/usr/src/sys/amd64/compile/CREAM amd64


>Description:

Read synopsis.

>How-To-Repeat:

N/A

>Fix:

	

--- portupgrade.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/portupgrade/Makefile,v
retrieving revision 1.210
diff -u -r1.210 Makefile
--- Makefile	7 Jan 2006 01:04:28 -0000	1.210
+++ Makefile	11 Feb 2006 15:42:37 -0000
@@ -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/
@@ -33,6 +33,10 @@
 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 +61,7 @@
 .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,bdb}
@@ -72,7 +77,7 @@
 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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/portupgrade/pkg-plist,v
retrieving revision 1.32
diff -u -r1.32 pkg-plist
--- pkg-plist	22 Jan 2006 02:52:17 -0000	1.32
+++ pkg-plist	11 Feb 2006 15:42:37 -0000
@@ -1,4 +1,3 @@
-etc/rc.d/000.pkgtools.sh
 @exec /bin/mkdir -p %D/lib/compat/pkg
 @unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true
 sbin/pkg_deinstall
Index: files/patch-etc_Makefile
===================================================================
RCS file: files/patch-etc_Makefile
diff -N files/patch-etc_Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-etc_Makefile	11 Feb 2006 15:42:37 -0000
@@ -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
--- portupgrade.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: