From owner-freebsd-ports  Sun Apr  8 21:10: 6 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3C3B037B423
	for <freebsd-ports@hub.freebsd.org>; Sun,  8 Apr 2001 21:10:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f394A2O77054;
	Sun, 8 Apr 2001 21:10:02 -0700 (PDT)
	(envelope-from gnats)
Received: from babylon.merseine.nu (c418236-a.clmba1.mo.home.com [24.12.203.134])
	by hub.freebsd.org (Postfix) with ESMTP id 3A4A337B424
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 Apr 2001 21:09:01 -0700 (PDT)
	(envelope-from ishmael@home.com)
Received: (from ishmael@localhost)
	by babylon.merseine.nu (8.11.3/8.11.3) id f394Als78884;
	Sun, 8 Apr 2001 23:10:47 -0500 (CDT)
	(envelope-from ishmael)
Message-Id: <200104090410.f394Als78884@babylon.merseine.nu>
Date: Sun, 8 Apr 2001 23:10:47 -0500 (CDT)
From: ishmael27@home.com
Reply-To: ishmael27@home.com
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/26449: Fixup port net/gtk+licq
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         26449
>Category:       ports
>Synopsis:       Fixup port net/gtk+licq
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 08 21:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Norris
>Release:        FreeBSD 4.3-BETA i386
>Organization:
none
>Environment:
System: FreeBSD babylon.merseine.nu 4.3-BETA FreeBSD 4.3-BETA #0: Tue Mar 6 20:09:07 CST 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386

>Description:
Fixup port net/gtk+licq (again):
Use perl regex to set PTHREAD_CFLAGS in all Makefile.in's.
Use perl regex to acutally install GNOME helppages in proper locations.
Remove files/patch-po::Makefile.in and replace with perl regex.
Bump PORTREVISION due to these changes.

>How-To-Repeat:

>Fix:
Be sure to cvs rm files/patch-po::Makefile.in

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2001/04/07 21:02:44	1.2
+++ Makefile	2001/04/09 03:59:22
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk+licq
 PORTVERSION=	0.50.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://gtk.licq.org/download/
 
@@ -31,9 +31,17 @@
 CONFIGURE_ARGS=	--enable-gnome
 .else
 CONFIGURE_ARGS=	--disable-gnome
+.endif
+
 post-patch:
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL5} -pi -e \
+		's|-D_REENTRANT|${PTHREAD_CFLAGS} -D_REENTRANT|g ; \
+		s|^localedir =.*|localedir = \$$(prefix)/share/locale| ; \
+		s|^gtklicq_helpdir =.*|gtklicq_helpdir = \
+		\$$(datadir)/help/gtk+licq/C|'
+.if !defined(HAVE_GNOME)
 	@${PERL5} -pi -e \
-		's|^SUBDIRS\ =.*|SUBDIRS\ =\ |' ${WRKSRC}/doc/Makefile.in
+		's|^SUBDIRS =.*|SUBDIRS =|' ${WRKSRC}/doc/Makefile.in
 .endif
 
 post-configure:
Index: files/patch-po::Makefile.in
===================================================================
RCS file: patch-po::Makefile.in
diff -N patch-po::Makefile.in
--- /tmp/cvsqvo7oQnoRr	Sun Apr  8 23:03:06 2001
+++ /dev/null	Sun Apr  8 23:01:41 2001
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Wed Aug 23 20:00:23 2000
-+++ po/Makefile.in.in	Sun Oct 15 11:11:11 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
>Release-Note:
>Audit-Trail:
>Unformatted:

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