From c76cf46929051f9dd322487d888c82f104026e6d Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Thu, 5 Oct 2000 07:17:31 +0000 Subject: Implement USE_GNOME, part 2. --- x11-fm/gnomemc/Makefile | 11 ++--------- x11-fm/nautilus/Makefile | 15 ++++----------- x11-fm/nautilus2/Makefile | 15 ++++----------- 3 files changed, 10 insertions(+), 31 deletions(-) (limited to 'x11-fm') diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index 75e464a089f5..f9c41264e593 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -14,19 +14,12 @@ DISTNAME= mc-${PORTVERSION} MAINTAINER= reg@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --without-edit -with-ncurses +CONFIGURE_ARGS= --without-edit -with-ncurses CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - MAKE="gmake" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index a532c06cb66f..cc65aeab8355 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -25,16 +25,15 @@ MOZILLA= mozilla-embedded BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .endif -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-pthread -L${LOCALBASE}/lib" \ + LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome .if defined(WITH_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/${MOZILLA} @@ -45,12 +44,6 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - LIBS="-pthread -L${LOCALBASE}/lib" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" - .if !defined(WITH_MOZILLA) pre-extract: @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index a532c06cb66f..cc65aeab8355 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -25,16 +25,15 @@ MOZILLA= mozilla-embedded BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} .endif -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_GMAKE= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-pthread -L${LOCALBASE}/lib" \ + LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome .if defined(WITH_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/${MOZILLA} @@ -45,12 +44,6 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - LIBS="-pthread -L${LOCALBASE}/lib" \ - LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" - .if !defined(WITH_MOZILLA) pre-extract: @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" -- cgit v1.2.3