Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2002 16:14:02 +0200 (CEST)
From:      Tilman Linneweh <tilman@arved.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        tilman@arved.de, stijn@win.tue.nl
Subject:   ports/42604: misc/grdb: Fix Build after GNOMENG mass commit
Message-ID:  <200209091414.g89EE2VD054657@tl.kom.tuwien.ac.at>

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

>Number:         42604
>Category:       ports
>Synopsis:       misc/grdb: Fix Build after GNOMENG mass commit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 09 11:30:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Tilman Linneweh
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
Vienna University of Technology
>Environment:
System: FreeBSD tl.kom.tuwien.ac.at 4.6-STABLE FreeBSD 4.6-STABLE #0: Wed Jul 24 15:50:09 CEST 2002 root@tl.kom.tuwien.ac.at:/usr/obj/usr/src/sys/MYKERNEL i386


	
>Description:
	PERL -> REINPLACE_CMD
	GTK is always needed, gnomelibs if with gnome.
	Implement gnomehack
	
>How-To-Repeat:
	
>Fix:

	

--- grdb.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/grdb/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	1 Sep 2002 15:13:10 -0000	1.9
+++ Makefile	9 Sep 2002 14:10:10 -0000
@@ -19,24 +19,25 @@
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_GNOME+=	gtk12
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+=	gtk12
-PKGNAMESUFFIX=	-gtk
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME+=	gnomelibs gnomeprefix gnomehack
+PKGNAMESUFFIX=	-gnome
+PLIST_SUB+=	DATADIR="share/gnome"
 .else
+PLIST_SUB+=	DATADIR="share"
 CONFIGURE_ARGS=	--disable-gnome
 .endif
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
 .if !defined(NOPORTDOCS)
--- grdb.diff ends here ---


>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?200209091414.g89EE2VD054657>