From leeym@utopia.leeym.com  Wed Oct 13 16:32:20 2004
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 14A3616A4CE; Wed, 13 Oct 2004 16:32:20 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 64F6A43D2F; Wed, 13 Oct 2004 16:32:19 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id 9BACE3EAE07;
	Thu, 14 Oct 2004 00:32:18 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 79477-09; Thu, 14 Oct 2004 00:32:16 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 87D8B3EAE12; Thu, 14 Oct 2004 00:32:16 +0800 (CST)
Message-Id: <20041013163216.87D8B3EAE12@utopia.leeym.com>
Date: Thu, 14 Oct 2004 00:32:16 +0800 (CST)
From: Yen-Ming Lee <leeym@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: seanc@FreeBSD.org
Subject: [PATCH] devel/bison: [SUMMARIZE CHANGES]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72646
>Category:       ports
>Synopsis:       [PATCH] devel/bison: minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    seanc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 13 16:40:08 GMT 2004
>Closed-Date:    Thu Nov 11 17:19:45 GMT 2004
>Last-Modified:  Thu Nov 11 17:19:45 GMT 2004
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA7 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA7 FreeBSD 5.3-BETA7 #0: Fri Oct  8 05:16:31 CST
>Description:

- relocate CONFLICTS
- add WITHOUT_NLS for USE_GETTEXT
- utilize INFO
- replace LOCALBASE with PREFIX

Port maintainer (seanc@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- bison-1.875_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/bison1875/Makefile,v
retrieving revision 1.49
diff -u -u -r1.49 Makefile
--- Makefile	3 Sep 2004 16:13:57 -0000	1.49
+++ Makefile	13 Oct 2004 16:29:33 -0000
@@ -15,14 +15,13 @@
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
-CONFLICTS=	bison-1.7[0-9]*
-
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+CONFLICTS=	bison-1.7[0-9]*
+
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -30,6 +29,15 @@
 		MAKEINFO="makeinfo --no-split"
 
 MAN1=		bison.1
+INFO=		bison
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .ifdef USE_BISON
 .error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
@@ -39,6 +47,6 @@
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 
 post-install:
-	${LN} -sf ${LOCALBASE}/bin/bison ${LOCALBASE}/bin/bison1875
+	${LN} -sf ${PREFIX}/bin/bison ${PREFIX}/bin/bison1875
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/bison1875/pkg-plist,v
retrieving revision 1.16
diff -u -u -r1.16 pkg-plist
--- pkg-plist	15 Nov 2003 22:20:01 -0000	1.16
+++ pkg-plist	13 Oct 2004 16:29:33 -0000
@@ -2,29 +2,26 @@
 bin/bison
 bin/bison1875
 bin/yacc
-@unexec install-info --delete %D/info/bison.info %D/info/dir
-info/bison.info
 lib/liby.a
-@exec install-info %D/info/bison.info %D/info/dir
-share/bison/c.m4
-share/bison/glr.c
-share/bison/lalr1.cc
-share/bison/m4sugar/m4sugar.m4
-share/bison/README
-share/bison/yacc.c
-share/locale/da/LC_MESSAGES/bison.mo
-share/locale/de/LC_MESSAGES/bison.mo
-share/locale/es/LC_MESSAGES/bison.mo
-share/locale/et/LC_MESSAGES/bison.mo
-share/locale/fr/LC_MESSAGES/bison.mo
-share/locale/hr/LC_MESSAGES/bison.mo
-share/locale/id/LC_MESSAGES/bison.mo
-share/locale/it/LC_MESSAGES/bison.mo
-share/locale/ja/LC_MESSAGES/bison.mo
-share/locale/nl/LC_MESSAGES/bison.mo
-share/locale/pt_BR/LC_MESSAGES/bison.mo
-share/locale/ru/LC_MESSAGES/bison.mo
-share/locale/sv/LC_MESSAGES/bison.mo
-share/locale/tr/LC_MESSAGES/bison.mo
-@dirrm share/bison/m4sugar
-@dirrm share/bison
+%%DATADIR%%/c.m4
+%%DATADIR%%/glr.c
+%%DATADIR%%/lalr1.cc
+%%DATADIR%%/m4sugar/m4sugar.m4
+%%DATADIR%%/README
+%%DATADIR%%/yacc.c
+%%NLS%%share/locale/da/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/et/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/id/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
+@dirrm %%DATADIR%%/m4sugar
+@dirrm %%DATADIR%%
--- bison-1.875_3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->seanc 
Responsible-Changed-By: sergei 
Responsible-Changed-When: Wed Oct 13 21:00:18 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72646 
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Thu Nov 11 17:19:44 GMT 2004 
State-Changed-Why:  
Committed, thanks. 

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