From c7fd3f71f2bf0d16ca22b85267a8ba4df8e9b5a2 Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 16 Jun 2000 10:38:50 +0000 Subject: Final round of the INSTALLS_SHLIBS=yes conversion. Few remaining ports with ldconfig in PLIST need personal consideration. --- net/gnet-glib2/Makefile | 1 + net/gnet-glib2/pkg-plist | 2 -- net/gnet/Makefile | 1 + net/gnet/pkg-plist | 2 -- net/gnet2/Makefile | 1 + net/gnet2/pkg-plist | 2 -- net/hesiod/Makefile | 6 ++---- net/hesiod/pkg-plist | 2 -- net/icqlib/Makefile | 1 + net/icqlib/pkg-plist | 2 -- net/icqlib0/Makefile | 1 + net/icqlib0/pkg-plist | 2 -- 12 files changed, 7 insertions(+), 16 deletions(-) (limited to 'net') diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile index ebbb92d8e769..7013bed25c3c 100644 --- a/net/gnet-glib2/Makefile +++ b/net/gnet-glib2/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config USE_LIBTOOL= yes +INSTALLS_SHLIBS= yes CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" .include diff --git a/net/gnet-glib2/pkg-plist b/net/gnet-glib2/pkg-plist index e31f5f5e6b91..2efdfc4a61d8 100644 --- a/net/gnet-glib2/pkg-plist +++ b/net/gnet-glib2/pkg-plist @@ -7,8 +7,6 @@ include/gnet/udp.h lib/libgnet.a lib/libgnet.so lib/libgnet.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gnet.m4 share/doc/libgnet1.0-dev/html/book1.html share/doc/libgnet1.0-dev/html/dnstest.html diff --git a/net/gnet/Makefile b/net/gnet/Makefile index ebbb92d8e769..7013bed25c3c 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config USE_LIBTOOL= yes +INSTALLS_SHLIBS= yes CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" .include diff --git a/net/gnet/pkg-plist b/net/gnet/pkg-plist index e31f5f5e6b91..2efdfc4a61d8 100644 --- a/net/gnet/pkg-plist +++ b/net/gnet/pkg-plist @@ -7,8 +7,6 @@ include/gnet/udp.h lib/libgnet.a lib/libgnet.so lib/libgnet.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gnet.m4 share/doc/libgnet1.0-dev/html/book1.html share/doc/libgnet1.0-dev/html/dnstest.html diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index ebbb92d8e769..7013bed25c3c 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 GLIB_CONFIG= ${LOCALBASE}/bin/glib12-config USE_LIBTOOL= yes +INSTALLS_SHLIBS= yes CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" .include diff --git a/net/gnet2/pkg-plist b/net/gnet2/pkg-plist index e31f5f5e6b91..2efdfc4a61d8 100644 --- a/net/gnet2/pkg-plist +++ b/net/gnet2/pkg-plist @@ -7,8 +7,6 @@ include/gnet/udp.h lib/libgnet.a lib/libgnet.so lib/libgnet.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gnet.m4 share/doc/libgnet1.0-dev/html/book1.html share/doc/libgnet1.0-dev/html/dnstest.html diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile index 66662a58e717..bf7e8c4ee8fd 100644 --- a/net/hesiod/Makefile +++ b/net/hesiod/Makefile @@ -22,7 +22,8 @@ MAN3= hesiod.3 hesiod_end.3 hesiod_free_list.3 \ hesiod_resolve.3 hesiod_to_bind.3 MAN5= hesiod.conf.5 -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes +INSTALLS_SHLIBS= yes .include @@ -35,7 +36,4 @@ VERSION=3.0 MAKE_ENV+= VERSION="${VERSION}" SONAME="${SONAME}" -post-install: - ${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib - .include diff --git a/net/hesiod/pkg-plist b/net/hesiod/pkg-plist index 28c4a601457c..04cc9777a7e5 100644 --- a/net/hesiod/pkg-plist +++ b/net/hesiod/pkg-plist @@ -3,5 +3,3 @@ include/hesiod.h lib/libhesiod.a lib/libhesiod.so lib/libhesiod.so.3.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile index 7541eed59b2d..dc534790b709 100644 --- a/net/icqlib/Makefile +++ b/net/icqlib/Makefile @@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= paxvel@iname.com +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes .include diff --git a/net/icqlib/pkg-plist b/net/icqlib/pkg-plist index c1e99c736dc9..6c9d92ab99f9 100644 --- a/net/icqlib/pkg-plist +++ b/net/icqlib/pkg-plist @@ -3,5 +3,3 @@ lib/libicq.la lib/libicq.so lib/libicq.so.1 include/icq.h -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile index 7541eed59b2d..dc534790b709 100644 --- a/net/icqlib0/Makefile +++ b/net/icqlib0/Makefile @@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= paxvel@iname.com +INSTALLS_SHLIBS= yes GNU_CONFIGURE= yes .include diff --git a/net/icqlib0/pkg-plist b/net/icqlib0/pkg-plist index c1e99c736dc9..6c9d92ab99f9 100644 --- a/net/icqlib0/pkg-plist +++ b/net/icqlib0/pkg-plist @@ -3,5 +3,3 @@ lib/libicq.la lib/libicq.so lib/libicq.so.1 include/icq.h -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -- cgit