From edwin@mavetju.org  Fri Aug 30 04:23:51 2002
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D3EBA37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Aug 2002 04:23:51 -0700 (PDT)
Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D58843E77
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Aug 2002 04:23:51 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141])
	by topaz.mdcc.cx (Postfix) with ESMTP id B3B092B739
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Aug 2002 13:23:47 +0200 (CEST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 38ECF6A7124; Fri, 30 Aug 2002 21:23:42 +1000 (EST)
Message-Id: <20020830112342.38ECF6A7124@k7.mavetju>
Date: Fri, 30 Aug 2002 21:23:42 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] make ports/emulators GNOMENG aware
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         42199
>Category:       ports
>Synopsis:       [patch] make ports/emulators GNOMENG aware
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 30 04:30:02 PDT 2002
>Closed-Date:    Fri Aug 30 06:41:13 PDT 2002
>Last-Modified:  Fri Aug 30 06:41:13 PDT 2002
>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/emulators GNOMENG aware

>How-To-Repeat:

    n/a

>Fix:

    emulators/basiliskII
    emulators/grustibus
    emulators/uae
    emulators/vx68k
    emulators/xmame
    emulators/xsystem35

--- emulators/basiliskII/Makefile.old	Fri Aug 30 21:05:53 2002
+++ emulators/basiliskII/Makefile	Fri Aug 30 21:06:45 2002
@@ -19,8 +19,8 @@
 WRKSRC=		${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	esound gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-fbdev-dga
--- emulators/uae/Makefile.old	Fri Aug 30 21:07:34 2002
+++ emulators/uae/Makefile	Fri Aug 30 21:07:45 2002
@@ -16,7 +16,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sound --enable-vidmode --enable-dga
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 
--- emulators/xmame/Makefile.old	Fri Aug 30 21:08:00 2002
+++ emulators/xmame/Makefile	Fri Aug 30 21:11:56 2002
@@ -19,6 +19,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
 
 MAN6=		x${MAMEMESS}.6
 
@@ -208,7 +209,7 @@
 
 .if ${WITH_ESOUND:L} == "yes"
 ESOUNDCOMMENT=
-USE_ESOUND=	yes
+USE_GNOME=	esound
 .else
 ESOUNDCOMMENT=\#\ 
 .endif
--- emulators/xsystem35/Makefile.old	Fri Aug 30 21:12:02 2002
+++ emulators/xsystem35/Makefile	Fri Aug 30 21:13:47 2002
@@ -15,8 +15,9 @@
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 
 PKGMESSAGE=	${WRKSRC}/MESSAGE
 
@@ -50,8 +51,8 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-audio=oss,esd --with-default-output=esd
 .else
 CONFIGURE_ARGS+=	--enable-audio=oss --with-default-output=oss
--- emulators/vx68k/Makefile.old	Fri Aug 30 21:19:04 2002
+++ emulators/vx68k/Makefile	Fri Aug 30 21:19:16 2002
@@ -17,7 +17,8 @@
 LIB_DEPENDS=	vm68k.4:${PORTSDIR}/emulators/libvm68k
 
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure vx68k-gtk/configure
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
--- emulators/grustibus/Makefile.old	Fri Aug 30 21:19:25 2002
+++ emulators/grustibus/Makefile	Fri Aug 30 21:20:42 2002
@@ -16,15 +16,16 @@
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=`${GNOME_CONFIG} --sysconfdir`
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME=	gnomelibs libcapplet
 .endif
 
 .include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Fri Aug 30 06:41:10 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=42199 
>Unformatted:
