From 9cb5055ec734a8cfa64860f0811c17a08938385d Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 27 Jun 2005 19:16:31 +0000 Subject: Try out a master/slave relationship to consolidate common macros. Suggedted by: adamw git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4129 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome2-fifth-toe/Makefile | 18 +++++------------- x11/gnome2-lite/Makefile | 28 +++------------------------- x11/gnome2-power-tools/Makefile | 13 ++++--------- x11/gnome2/Makefile | 12 ++++++++---- 4 files changed, 20 insertions(+), 51 deletions(-) (limited to 'x11') diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index d49c098fe..c0b3fb278 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -2,17 +2,12 @@ # Date created: 20 September 2002 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/x11/gnome2-fifth-toe/Makefile,v 1.65 2005/04/18 21:02:56 marcus Exp $ +# $FreeBSD$ # -PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.11.3 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -fifth-toe -MAINTAINER= gnome@FreeBSD.org COMMENT= Additional GNOME 2 applications not included in the core desktop RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ @@ -39,10 +34,7 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ goobox:${PORTSDIR}/audio/goobox \ inkscape:${PORTSDIR}/graphics/inkscape -.include +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -NO_BUILD= yes - -do-install: # empty - -.include +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index f26bca883..e010dc505 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -2,18 +2,12 @@ # Date created: 30 November 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/x11/gnome2-lite/Makefile,v 1.21 2005/04/18 21:02:55 marcus Exp $ +# $FreeBSD$ # -PORTNAME= gnome2 -PORTVERSION= 2.11.3 CATEGORIES= x11 gnome -MASTER_SITES= # empty PKGNAMESUFFIX= -lite -DISTFILES= # empty -EXTRACT_ONLY= # empty -MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ @@ -39,23 +33,7 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ totem:${PORTSDIR}/multimedia/totem-gstreamer -NO_BUILD= yes - -USE_PYTHON= yes - +MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -pre-configure: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - -do-install: # empty - -.include - -.if ${ARCH} == "i386" || ${OSVERSION} > 500035 -RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -.endif - -.include +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index e9f2605c2..bb5508fef 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -5,14 +5,9 @@ # $FreeBSD$ # -PORTNAME= gnome2-power-tools -PORTVERSION= 2.11.3 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -power-tools -MAINTAINER= gnome@FreeBSD.org COMMENT= "Geektoys" for the GNOME 2 power user RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ @@ -29,8 +24,8 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PO gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor # ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -do-install: # empty +.include "${MASTERDIR}/Makefile" -.include diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 6dc4f6d99..7a8501b9a 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -7,15 +7,15 @@ PORTNAME= gnome2 PORTVERSION= 2.11.3 -CATEGORIES= x11 gnome +CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org -COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop +COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop -RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ +RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog \ @@ -62,9 +62,11 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 NO_BUILD= yes +.if !defined(GNOME_SLAVE) USE_PYTHON= yes +.endif -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && !defined(GNOME_SLAVE) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif @@ -73,8 +75,10 @@ do-install: # empty .include +.if !defined(GNOME_SLAVE) .if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif +.endif .include -- cgit v1.2.3