From b7bdcd418e7aca3dd98409e16a4c4ae9bc289d02 Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Thu, 5 Oct 2000 07:10:50 +0000 Subject: Implement USE_GNOME, part 1. --- editors/dedit/Makefile | 13 ++++--------- editors/gedit/Makefile | 11 ++--------- editors/gedit2/Makefile | 11 ++--------- editors/ghex/Makefile | 11 ++--------- editors/ghex2/Makefile | 11 ++--------- editors/glimmer/Makefile | 18 ++++-------------- editors/gmanedit/Makefile | 14 ++++---------- 7 files changed, 20 insertions(+), 69 deletions(-) (limited to 'editors') diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile index e596049c4c1e..1392f1504760 100644 --- a/editors/dedit/Makefile +++ b/editors/dedit/Makefile @@ -13,19 +13,14 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= iconv.1:${PORTSDIR}/converters/iconv \ - gnome.4:${PORTSDIR}/x11/gnomelibs +LIB_DEPENDS= iconv.1:${PORTSDIR}/converters/iconv WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASSE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib -liconv" MAN1= dedit.1 @@ -35,8 +30,8 @@ MANLANG= "" ja post-install: .if defined(KANJI) - ${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 \ - ${PREFIX}/man/ja/man1/dedit.1 + ${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 \ + ${PREFIX}/man/ja/man1/dedit.1 .endif .include diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 32d9ef4fc029..8293cc0e43f4 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint \ +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gedit.1 diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index 32d9ef4fc029..8293cc0e43f4 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint \ +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" MAN1= gedit.1 diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index 5d11a55ee75c..296760145e6d 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/ghex MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint BROKEN= "Uses internals from gnomeprint that are no longer present" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile index 5d11a55ee75c..296760145e6d 100644 --- a/editors/ghex2/Makefile +++ b/editors/ghex2/Makefile @@ -13,22 +13,15 @@ MASTER_SITE_SUBDIR= stable/sources/ghex MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gnomeprint.12:${PORTSDIR}/print/gnomeprint -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnomeprint.12:${PORTSDIR}/print/gnomeprint BROKEN= "Uses internals from gnomeprint that are no longer present" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile index dd25599107ea..d0d7f8d5fca7 100644 --- a/editors/glimmer/Makefile +++ b/editors/glimmer/Makefile @@ -14,22 +14,12 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes -USE_LIBTOOL= yes USE_PYTHON= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +USE_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile index c91fda4affdf..318b4f51ee8f 100644 --- a/editors/gmanedit/Makefile +++ b/editors/gmanedit/Makefile @@ -14,20 +14,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + ALL_TARGET= clean all post-extract: -- cgit v1.2.3