From owner-freebsd-ports Mon Sep 9 11:30:19 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98FBE37B400 for ; Mon, 9 Sep 2002 11:30:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E0F243E6E for ; Mon, 9 Sep 2002 11:30:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g89IU3JU061640 for ; Mon, 9 Sep 2002 11:30:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g89IU3YK061639; Mon, 9 Sep 2002 11:30:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0769E37B400 for ; Mon, 9 Sep 2002 11:22:20 -0700 (PDT) Received: from tl.kom.tuwien.ac.at (tl.kom.tuwien.ac.at [128.131.34.148]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF72743E3B for ; Mon, 9 Sep 2002 11:22:18 -0700 (PDT) (envelope-from tilman@arved.de) Received: from tl.kom.tuwien.ac.at (localhost [127.0.0.1]) by tl.kom.tuwien.ac.at (8.12.5/8.12.5) with ESMTP id g89EE3oK054658; Mon, 9 Sep 2002 16:14:03 +0200 (CEST) (envelope-from tilman@tl.kom.tuwien.ac.at) Received: (from tilman@localhost) by tl.kom.tuwien.ac.at (8.12.5/8.12.5/Submit) id g89EE2VD054657; Mon, 9 Sep 2002 16:14:02 +0200 (CEST) Message-Id: <200209091414.g89EE2VD054657@tl.kom.tuwien.ac.at> Date: Mon, 9 Sep 2002 16:14:02 +0200 (CEST) From: Tilman Linneweh Reply-To: Tilman Linneweh To: FreeBSD-gnats-submit@FreeBSD.org Cc: tilman@arved.de, stijn@win.tue.nl X-Send-Pr-Version: 3.113 Subject: ports/42604: misc/grdb: Fix Build after GNOMENG mass commit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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 -.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