diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 320b0f875865..621ea559decb 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,7 +3,7 @@ # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu # -# $Id: Makefile,v 1.17 1999/03/09 01:08:53 nectar Exp $ +# $Id: Makefile,v 1.18 1999/04/08 18:08:32 steve Exp $ # DISTNAME= libgtop-1.0.1 @@ -13,20 +13,16 @@ MASTER_SITE_SUBDIR= sources/libgtop MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile -# implicit dependencies: -# gettext, glib12 +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 8c1e8d447fa0..2d0b33f7979a 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -48,35 +48,27 @@ include/glibtop/version.h include/glibtop/write.h include/glibtop/xmalloc.h lib/libgtop.a -lib/libgtop.la lib/libgtop.so lib/libgtop.so.1 lib/libgtop_common.a -lib/libgtop_common.la lib/libgtop_common.so lib/libgtop_common.so.1 lib/libgtop_guile.a -lib/libgtop_guile.la lib/libgtop_guile.so lib/libgtop_guile.so.1 lib/libgtop_guile_names.a -lib/libgtop_guile_names.la lib/libgtop_guile_names.so lib/libgtop_guile_names.so.1 lib/libgtop_names.a -lib/libgtop_names.la lib/libgtop_names.so lib/libgtop_names.so.1 lib/libgtop_suid_common.a -lib/libgtop_suid_common.la lib/libgtop_suid_common.so lib/libgtop_suid_common.so.1 lib/libgtop_sysdeps.a -lib/libgtop_sysdeps.la lib/libgtop_sysdeps.so lib/libgtop_sysdeps.so.1 lib/libgtop_sysdeps_suid.a -lib/libgtop_sysdeps_suid.la lib/libgtop_sysdeps_suid.so lib/libgtop_sysdeps_suid.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 320b0f875865..621ea559decb 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,7 +3,7 @@ # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu # -# $Id: Makefile,v 1.17 1999/03/09 01:08:53 nectar Exp $ +# $Id: Makefile,v 1.18 1999/04/08 18:08:32 steve Exp $ # DISTNAME= libgtop-1.0.1 @@ -13,20 +13,16 @@ MASTER_SITE_SUBDIR= sources/libgtop MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile -# implicit dependencies: -# gettext, glib12 +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 8c1e8d447fa0..2d0b33f7979a 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -48,35 +48,27 @@ include/glibtop/version.h include/glibtop/write.h include/glibtop/xmalloc.h lib/libgtop.a -lib/libgtop.la lib/libgtop.so lib/libgtop.so.1 lib/libgtop_common.a -lib/libgtop_common.la lib/libgtop_common.so lib/libgtop_common.so.1 lib/libgtop_guile.a -lib/libgtop_guile.la lib/libgtop_guile.so lib/libgtop_guile.so.1 lib/libgtop_guile_names.a -lib/libgtop_guile_names.la lib/libgtop_guile_names.so lib/libgtop_guile_names.so.1 lib/libgtop_names.a -lib/libgtop_names.la lib/libgtop_names.so lib/libgtop_names.so.1 lib/libgtop_suid_common.a -lib/libgtop_suid_common.la lib/libgtop_suid_common.so lib/libgtop_suid_common.so.1 lib/libgtop_sysdeps.a -lib/libgtop_sysdeps.la lib/libgtop_sysdeps.so lib/libgtop_sysdeps.so.1 lib/libgtop_sysdeps_suid.a -lib/libgtop_sysdeps_suid.la lib/libgtop_sysdeps_suid.so lib/libgtop_sysdeps_suid.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R