Change PREFIX from /usr to the default not to harm bento.

Prepare rc.d scripts that do ldconfig on startup, because
$PREFIX/lib/compat and $PREFIX/lib/compat/aout are no longer included
in the default $ldconfig_paths and $ldconfig_paths_aout, respectively.

6 files changed, 32 insertions, 21 deletions

diff --git a/misc/compat22/Makefile b/misc/compat22/Makefile
index 98fdd06fed8e..4b6b5d14134a 100644
--- a/misc/compat22/Makefile
+++ b/misc/compat22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	compat22
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=	releases/${ARCH}/${PORTVERSION}-RELEASE/${PORTNAME}
@@ -23,11 +24,8 @@ MAINTAINER=	hetzels@westbend.net
 ONLY_FOR_ARCHS=	i386
 PORTOBJFORMAT=	aout
 
-PREFIX?=	/usr
-
 WRKSRC=		${WRKDIR}/usr/lib/compat/aout
 NO_MTREE=	yes
-NO_BUILD=	yes
 
 TARGET_DIR=	${PREFIX}/lib/compat/aout
 
@@ -35,16 +33,20 @@ INSTALLS_SHLIB=	yes
 LDCONFIG=	/sbin/ldconfig -aout
 LDCONFIG_DIRS=	%%PREFIX%%/lib/compat/aout
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=		"does damage to bento cluster"
-.endif
+.include <bsd.port.pre.mk>
 
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
 
+do-build:
+	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	) > ${WRKDIR}/000.${PORTNAME}.sh
+
 do-install:
+	${MKDIR} ${TARGET_DIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
 	${INSTALL_DATA} ${WRKDIR}/usr/libexec/ld.so ${PREFIX}/libexec/
+	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/compat22/pkg-plist b/misc/compat22/pkg-plist
index 476cef90c76c..741443072418 100644
--- a/misc/compat22/pkg-plist
+++ b/misc/compat22/pkg-plist
@@ -1,3 +1,4 @@
+etc/rc.d/000.compat22.sh
 lib/compat/aout/libalias.so.2.4
 lib/compat/aout/libc.so.3.1
 lib/compat/aout/libc_r.so.3.0
@@ -34,4 +35,6 @@ lib/compat/aout/libutil.so.2.2
 lib/compat/aout/libvgl.so.1.0
 lib/compat/aout/libxpg4.so.2.0
 lib/compat/aout/libz.so.2.0
+@dirrm lib/compat/aout
+@unexec rmdir %D/lib/compat 2>/dev/null || true
 libexec/ld.so
diff --git a/misc/compat3x/Makefile b/misc/compat3x/Makefile
index 486f86afe52b..c72c5a5f482b 100644
--- a/misc/compat3x/Makefile
+++ b/misc/compat3x/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	compat3x
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=	releases/${ARCH}/${PORTVERSION}-RELEASE/${PORTNAME}
@@ -23,30 +24,31 @@ MAINTAINER=	hetzels@westbend.net
 
 ONLY_FOR_ARCHS=	i386
 
-PREFIX?=	/usr
-
 WRKSRC=		${WRKDIR}/usr/lib/compat
 NO_MTREE=	yes
-NO_BUILD=	yes
 
 TARGET_DIR=	${PREFIX}/lib/compat
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=		"does damage to bento cluster"
-.endif
+.include <bsd.port.pre.mk>
 
 do-extract:
 	${MKDIR} ${WRKDIR}
 	cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
 	${MV} ${WRKSRC}/libc_r.so.4 ${WRKSRC}/libc_r.so.4.compat3x
 
+do-build:
+	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	) > ${WRKDIR}/000.${PORTNAME}.sh
+
 do-install:
+	${MKDIR} ${TARGET_DIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
 	if [ ! -e ${TARGET_DIR}/libc_r.so.4.compat4x ]; then \
 		${LN} -sf ${TARGET_DIR}/libc_r.so.4.compat3x ${TARGET_DIR}/libc_r.so.4; \
 	fi
+	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/compat3x/pkg-plist b/misc/compat3x/pkg-plist
index b82a1d8bfd44..461e22dfccb7 100644
--- a/misc/compat3x/pkg-plist
+++ b/misc/compat3x/pkg-plist
@@ -1,3 +1,4 @@
+etc/rc.d/000.compat3x.sh
 lib/compat/libalias.so.3
 lib/compat/libc.so.3
 lib/compat/libc_r.so.3
@@ -22,3 +23,4 @@ lib/compat/libutil.so.2
 lib/compat/libvgl.so.1
 lib/compat/libwrap.so.2
 lib/compat/libxpg4.so.2
+@unexec rmdir %D/lib/compat 2>/dev/null || true
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index b5f948224e3c..e5ab458ba8ac 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	compat4x
 PORTVERSION=	${COMPAT4X_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${COMPAT4X_MASTER_SITES}
 PKGNAMESUFFIX=	-${ARCH}
@@ -15,21 +16,14 @@ DIST_SUBDIR=	${ARCH}/${PORTVERSION}
 
 MAINTAINER=	hetzels@westbend.net
 
-PREFIX?=	/usr
-
 WRKSRC=		${WRKDIR}/usr/lib/compat
 NO_MTREE=	yes
-NO_BUILD=	yes
 
 TARGET_DIR=	${PREFIX}/lib/compat
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE=		"does damage to bento cluster"
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
@@ -66,10 +60,16 @@ do-extract:
 	${MV} ${WRKSRC}/libc_r.so.4 ${WRKSRC}/libc_r.so.4.compat4x
 .endif
 
+do-build:
+	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	) > ${WRKDIR}/000.${PORTNAME}.sh
+
 do-install:
+	${MKDIR} ${TARGET_DIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${TARGET_DIR}/
 .if ${OSVERSION} >= 500000
 	${LN} -sf ${TARGET_DIR}/libc_r.so.4.compat4x ${TARGET_DIR}/libc_r.so.4
 .endif
+	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>
diff --git a/misc/compat4x/pkg-plist b/misc/compat4x/pkg-plist
index e5f6e048bfef..d64e84aa6478 100644
--- a/misc/compat4x/pkg-plist
+++ b/misc/compat4x/pkg-plist
@@ -1,6 +1,8 @@
+etc/rc.d/000.compat4x.sh
 %%CURRENT_ONLY:%%lib/compat/libc.so.4
 %%CURRENT_ONLY:%%@unexec if [ -e %B/libc_r.so.4.compat3x ]; then ln -sf %B/libc_r.so.4.compat3x %B/libc_r.so.4; else rm %B/libc_r.so.4; fi
 %%CURRENT_ONLY:%%lib/compat/libc_r.so.4.compat4x
 %%CURRENT_ONLY:%%@exec ln -sf %B/%f %B/libc_r.so.4
 lib/compat/libcrypto.so.1
 lib/compat/libssl.so.1
+@unexec rmdir %D/lib/compat 2>/dev/null || true