diff options
| author | mycroft <mycroft> | 2000-11-29 02:37:43 +0000 |
|---|---|---|
| committer | mycroft <mycroft> | 2000-11-29 02:37:43 +0000 |
| commit | baabc04240e131e10f5cc0ecf5c072ac43848d4a (patch) | |
| tree | 7f6ab4c1319fe9ea9be9bbc87e545634bd2701cf /x11/gnome-libs | |
| parent | 0ce4c389c6e07f1e462b7e712aa8bf770d60e2dd (diff) | |
| download | pkgsrc-baabc04240e131e10f5cc0ecf5c072ac43848d4a.tar.gz | |
Remove the hack that forces libgnome to be built static on a.out. It works
Just Fine shared.
Diffstat (limited to 'x11/gnome-libs')
| -rw-r--r-- | x11/gnome-libs/Makefile | 17 | ||||
| -rw-r--r-- | x11/gnome-libs/pkg/PLIST | 3 |
2 files changed, 3 insertions, 17 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index d9dc2f51731..e224451d7a2 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2000/11/27 10:51:08 itojun Exp $ +# $NetBSD: Makefile,v 1.55 2000/11/29 02:37:43 mycroft Exp $ DISTNAME= gnome-libs-1.2.8 CATEGORIES= x11 gnome @@ -32,24 +32,11 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LOCALSTATEDIR= /var/gnome -PLIST_SRC= ${WRKDIR}/PLIST PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ LOCALSTATEDIR=${LOCALSTATEDIR} .include "../../mk/bsd.prefs.mk" -# XXX This is a kludge to get libgnome to work on a.out systems. -# -.if (${OBJECT_FMT} == a.out) -LIBGNOME_LTCOMPILE_FLAGS= -static -LIBGNOME_LTLINK_FLAGS= -all-static -.else -LIBGNOME_LTCOMPILE_FLAGS= -LIBGNOME_LTLINK_FLAGS= -.endif -MAKE_ENV+= LIBGNOME_LTCOMPILE_FLAGS="${LIBGNOME_LTCOMPILE_FLAGS}" -MAKE_ENV+= LIBGNOME_LTLINK_FLAGS="${LIBGNOME_LTLINK_FLAGS}" - .if ${OPSYS} == "SunOS" DEPENDS+= db-*:../../databases/db CPPFLAGS+= -I${LOCALBASE}/include/db2 @@ -75,8 +62,6 @@ pre-build: post-install: ${MKDIR} ${PREFIX}/etc/CORBA/servers ${TOUCH} ${PREFIX}/etc/CORBA/servers/.directory - ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - cd ${PREFIX}; ${FIND} lib -name 'libgnome.so.*.*' >>${PLIST_SRC} ${MKDIR} ${LOCALSTATEDIR} ${TEST} ${PREFIX} = ${LOCALBASE} || \ ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST index e58d7f2f354..ef3cd800220 100644 --- a/x11/gnome-libs/pkg/PLIST +++ b/x11/gnome-libs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2000/11/07 04:36:37 rh Exp $ +@comment $NetBSD: PLIST,v 1.33 2000/11/29 02:37:43 mycroft Exp $ bin/dns-helper bin/gconfigger bin/gnome-bug @@ -183,6 +183,7 @@ lib/libart_lgpl.la lib/libart_lgpl.so.4.0 lib/libgnome.a lib/libgnome.la +lib/libgnome.so.35.12 lib/libgnomesupport.a lib/libgnomesupport.la lib/libgnomesupport.so.0.0 |