Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Aug 2002 20:18:08 +1000 (EST)
From:      Edwin Groothuis <edwin@mavetju.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/42285: [patch] make ports/sysutils GNOMENG aware
Message-ID:  <20020831101808.E74916A7124@k7.mavetju>

next in thread | raw e-mail | index | archive | help

>Number:         42285
>Category:       ports
>Synopsis:       [patch] make ports/sysutils GNOMENG aware
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 01 04:20:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #3: Mon Mar 11 13:32:05 EST 2002 edwin@k7.mavetju.org:/usr/src/sys/compile/k7 i386

>Description:

    make ports/sysutils GNOMENG aware

>How-To-Repeat:

    n/a

>Fix:

    sysutils/bubblemon-dockapp
    sysutils/gcombust
    sysutils/gkrellflynn
    sysutils/gkrellm
    sysutils/gkrellmouse
    sysutils/gkrellmwho
    sysutils/gtoaster
    sysutils/guitar
    sysutils/gupsc
    sysutils/thefish
    sysutils/wmcube-gdk
    sysutils/xcdroast
    sysutils/xlogmaster
    sysutils/xw
    sysutils/xwatch

--- sysutils/bubblemon-dockapp/Makefile.old	Sat Aug 31 20:03:24 2002
+++ sysutils/bubblemon-dockapp/Makefile	Sat Aug 31 20:03:37 2002
@@ -15,7 +15,8 @@
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 
--- sysutils/gcombust/Makefile.old	Sat Aug 31 20:03:59 2002
+++ sysutils/gcombust/Makefile	Sat Aug 31 20:04:08 2002
@@ -19,7 +19,8 @@
 		cdlabelgen:${PORTSDIR}/print/cdlabelgen
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- sysutils/gkrellflynn/Makefile.old	Sat Aug 31 20:04:19 2002
+++ sysutils/gkrellflynn/Makefile	Sat Aug 31 20:04:30 2002
@@ -15,9 +15,9 @@
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
 ALL_TARGET=	${PORTNAME}.so
 
 do-install:
--- sysutils/gkrellm/Makefile.old	Sat Aug 31 20:04:44 2002
+++ sysutils/gkrellm/Makefile	Sat Aug 31 20:04:57 2002
@@ -16,7 +16,8 @@
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
--- sysutils/gkrellmouse/Makefile.old	Sat Aug 31 20:05:11 2002
+++ sysutils/gkrellmouse/Makefile	Sat Aug 31 20:05:21 2002
@@ -18,8 +18,8 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 do-install:
--- sysutils/gtoaster/Makefile.old	Sat Aug 31 20:05:33 2002
+++ sysutils/gtoaster/Makefile	Sat Aug 31 20:05:41 2002
@@ -23,7 +23,8 @@
 CONFIGURE_ARGS=	--prefix=${X11BASE}
 CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
--- sysutils/guitar/Makefile.old	Sat Aug 31 20:05:51 2002
+++ sysutils/guitar/Makefile	Sat Aug 31 20:06:36 2002
@@ -15,14 +15,15 @@
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gnome
 .endif
--- sysutils/gupsc/Makefile.old	Sat Aug 31 20:08:17 2002
+++ sysutils/gupsc/Makefile	Sat Aug 31 20:08:25 2002
@@ -16,7 +16,8 @@
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
--- sysutils/wmcube-gdk/Makefile.old	Sat Aug 31 20:08:36 2002
+++ sysutils/wmcube-gdk/Makefile	Sat Aug 31 20:08:47 2002
@@ -17,7 +17,8 @@
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKEFILE=	Makefile.FREEBSD
 
 do-install:
--- sysutils/xcdroast/Makefile.old	Sat Aug 31 20:09:04 2002
+++ sysutils/xcdroast/Makefile	Sat Aug 31 20:09:48 2002
@@ -13,15 +13,13 @@
 
 MAINTAINER=	lehmann@ans-netz.de
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib gdkpixbuf
 
 MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
--- sysutils/xlogmaster/Makefile.old	Sat Aug 31 20:10:16 2002
+++ sysutils/xlogmaster/Makefile	Sat Aug 31 20:10:30 2002
@@ -15,7 +15,8 @@
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 MAN1=		xlogmaster.1
--- sysutils/xw/Makefile.old	Sat Aug 31 20:11:16 2002
+++ sysutils/xw/Makefile	Sat Aug 31 20:11:27 2002
@@ -14,8 +14,8 @@
 
 GTK_CONFIG=${X11BASE}/bin/gtk12-config
 
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
--- sysutils/xwatch/Makefile.old	Sat Aug 31 20:11:45 2002
+++ sysutils/xwatch/Makefile	Sat Aug 31 20:11:55 2002
@@ -13,7 +13,8 @@
 MAINTAINER=	mph@freebsd.org
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 post-install:
--- sysutils/thefish/Makefile.old	Sat Aug 31 20:12:05 2002
+++ sysutils/thefish/Makefile	Sat Aug 31 20:17:32 2002
@@ -19,7 +19,9 @@
 USE_X_PREFIX=	yes
 .endif
 .if !defined(NO_GUI) && !defined(WITH_GTK2)
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 .endif
 
 MAN1=		thefish.1
--- sysutils/gkrellmwho/Makefile.old	Sat Aug 31 20:12:49 2002
+++ sysutils/gkrellmwho/Makefile	Sat Aug 31 20:12:57 2002
@@ -17,8 +17,8 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 ALL_TARGET=	#empty
 
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020831101808.E74916A7124>