diff options
| author | asami <asami@FreeBSD.org> | 2000-06-18 17:26:54 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 2000-06-18 17:26:54 +0800 |
| commit | 494c1f87552cab32e289a330f619b1e04c9dbf86 (patch) | |
| tree | 76f8008f0a064d2c8c049dd5228393af0d31a070 | |
| parent | 89218e6d3e3dd0e9675242baed1d85917655c47d (diff) | |
| download | freebsd-ports-gnome-494c1f87552cab32e289a330f619b1e04c9dbf86.tar.gz freebsd-ports-gnome-494c1f87552cab32e289a330f619b1e04c9dbf86.tar.zst freebsd-ports-gnome-494c1f87552cab32e289a330f619b1e04c9dbf86.zip | |
Back out LDCONFIG_DIRS change -- they don't work with a.out libs.
Reported by: bento
| -rw-r--r-- | www/libxpg4-ns/Makefile | 5 | ||||
| -rw-r--r-- | www/libxpg4-ns/pkg-plist | 2 | ||||
| -rw-r--r-- | x11/XFree86-aoutlibs/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-aoutlibs/pkg-plist | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile index 3f69dc6af0b4..b85dc8582193 100644 --- a/www/libxpg4-ns/Makefile +++ b/www/libxpg4-ns/Makefile @@ -14,8 +14,6 @@ DISTNAME= libxpg4-3.3 MAINTAINER= sada@FreeBSD.ORG -INSTALLS_SHLIB= yes - MAKE_ENV+= OBJFORMAT=aout SHLIB_MAJOR=2 SHLIB_MINOR=0 PORTOBJFORMAT= aout @@ -31,6 +29,9 @@ pre-build: pre-install: ${MKDIR} ${LIBDIR} +post-install: + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${LIBDIR} + extract-from-freebsd: # only for port maintainer. .if exists(/usr/src/lib) @${RM} -rf ${WRKSRC} diff --git a/www/libxpg4-ns/pkg-plist b/www/libxpg4-ns/pkg-plist index ea4d53a09276..343f355e7829 100644 --- a/www/libxpg4-ns/pkg-plist +++ b/www/libxpg4-ns/pkg-plist @@ -1,3 +1,5 @@ lib/aout/libxpg4-ns.a lib/aout/libxpg4-ns.so.2.0 lib/aout/libxpg4-ns_p.a +@exec env OBJFORMAT=aout ldconfig -m %B +@unexec env OBJFORMAT=aout ldconfig -R %B diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile index e6437405a39e..98f69e91d914 100644 --- a/x11/XFree86-aoutlibs/Makefile +++ b/x11/XFree86-aoutlibs/Makefile @@ -18,7 +18,6 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/lib NO_BUILD= yes -INSTALLS_SHLIB= yes PORTOBJFORMAT= aout USE_X_PREFIX= yes @@ -34,5 +33,6 @@ do-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} \ ${INSTALL_PROGRAM} $$l ${PREFIX}/lib/aout; \ done + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/aout .include <bsd.port.mk> diff --git a/x11/XFree86-aoutlibs/pkg-plist b/x11/XFree86-aoutlibs/pkg-plist index 7a0b3db44d11..f6793c5a33d3 100644 --- a/x11/XFree86-aoutlibs/pkg-plist +++ b/x11/XFree86-aoutlibs/pkg-plist @@ -11,3 +11,5 @@ lib/aout/libXi.so.6.0 lib/aout/libXtst.so.6.1 lib/aout/libPEX5.so.6.0 lib/aout/libXp.so.6.2 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |