From rafan@svm.csie.ntu.edu.tw  Mon Feb 19 20:15:23 2007
Return-Path: <rafan@svm.csie.ntu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8047C16CD5C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Feb 2007 20:15:23 +0000 (UTC)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75])
	by mx1.freebsd.org (Postfix) with ESMTP id 14B1313C4AA
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Feb 2007 20:15:22 +0000 (UTC)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1])
	by svm.csie.ntu.edu.tw (8.13.8/8.13.8) with ESMTP id l1JKFMll068390;
	Tue, 20 Feb 2007 04:15:22 +0800 (CST)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: (from rafan@localhost)
	by svm.csie.ntu.edu.tw (8.13.8/8.13.8/Submit) id l1JKFMnw097177;
	Tue, 20 Feb 2007 04:15:22 +0800 (CST)
	(envelope-from rafan)
Message-Id: <200702192015.l1JKFMnw097177@svm.csie.ntu.edu.tw>
Date: Tue, 20 Feb 2007 04:15:22 +0800 (CST)
From: Rong-En Fan <rafan@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ginga-freebsd@ginganet.org
Subject: [PATCH] japanese/ja-ng: make slave port happy
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ginga-freebsd@ginganet.org

>Number:         109333
>Category:       ports
>Synopsis:       [PATCH] japanese/ja-ng: make slave port happy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 19 20:20:10 GMT 2007
>Closed-Date:    Tue Feb 20 16:58:57 GMT 2007
>Last-Modified:  Tue Feb 20 17:00:23 GMT 2007
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
System: FreeBSD svm.csie.ntu.edu.tw 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #13: Wed Jan 10 22:55:44 CST 2007
>Description:
- Currently, MAKE_ARGS is assigned by = which can not be overwritten by slave
  port (japanese/ng-canna)
- Move slave port logic here. Make slave port as simple as possible.
  This also allow users to build this port with canna support.
  (I will change slave port once when I commit these changes)
- Set DOCSDIR, so we can use PORTDOCS
- Since we use PORTDOCS, there is only one line in pkg-plist. Convert
  to PLIST_FILES.

Removed file(s):
- pkg-plist

Port maintainer (ginga-freebsd@ginganet.org) is cc'd.

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

--- ja-ng-1.4.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/japanese/ng/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile	7 Nov 2003 09:28:11 -0000	1.13
+++ Makefile	19 Feb 2007 20:11:56 -0000
@@ -17,11 +17,27 @@
 MAINTAINER?=	ginga-freebsd@ginganet.org
 COMMENT?=	A very light Emacs-clone with Japanese support
 
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="-ltermcap"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}"
+LIBS=		-ltermcap
+
 ALL_TARGET=	ng
 
+DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
+
 MYPORTDOCS=	CHANGES.1_3 CHANGES.doc Ng.FAQ Ng.doc Ng.ref Ng.tut \
 		README.Ng README.SKG
+PORTDOCS=	${MYPORTDOCS:C/$/.euc-jp/}
+
+PLIST_FILES=	bin/ng
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_CANNA)
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
+
+CFLAGS+=	-I${LOCALBASE}/include -DCANNA
+LIBS+=		-L${LOCALBASE}/lib -lcanna
+.endif
 
 post-patch:
 	@(cd ${WRKSRC}; ${LN} -sf sys/bsd/Makefile . )
@@ -29,10 +45,10 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/ng
+	${MKDIR} ${DOCSDIR}
 .for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/share/doc/ja/ng/${file}.euc-jp
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}/${file}.euc-jp
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	18 Jun 2003 15:23:59 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-bin/ng
-share/doc/ja/ng/CHANGES.1_3.euc-jp
-share/doc/ja/ng/CHANGES.doc.euc-jp
-share/doc/ja/ng/Ng.FAQ.euc-jp
-share/doc/ja/ng/Ng.doc.euc-jp
-share/doc/ja/ng/Ng.ref.euc-jp
-share/doc/ja/ng/Ng.tut.euc-jp
-share/doc/ja/ng/README.Ng.euc-jp
-share/doc/ja/ng/README.SKG.euc-jp
-@dirrm share/doc/ja/ng
--- ja-ng-1.4.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Feb 19 20:20:20 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109333 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Feb 19 20:20:28 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109333 

From: KAWAGUTI Ginga <ginga-freebsd@ginganet.org>
To: bug-followup@FreeBSD.org
Cc: ginga-freebsd@ginganet.org
Subject: Re: ports/109333: [PATCH] japanese/ja-ng: make slave port happy
Date: Wed, 21 Feb 2007 01:23:16 +0900

 Japanese/ng port maintainer approves this change.
 It seems to be a good change.
 
 Thank you for your notification.
 
 In Mon, Feb 19, 2007 at 08:20:25PM +0000,
 Edwin Groothuis <edwin@FreeBSD.org> wrote:
 > Please note that PR ports/109333 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/109333
 > 
 > -- 
 > Edwin Groothuis
 > edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Tue Feb 20 16:58:56 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109333 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109333: commit references a PR
Date: Tue, 20 Feb 2007 16:57:58 +0000 (UTC)

 rafan       2007-02-20 16:57:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     japanese/ng          Makefile 
   Removed files:
     japanese/ng          pkg-plist 
   Log:
   - Currently, MAKE_ARGS is assigned by = which can not be overwritten by slave
     port (japanese/ng-canna).
   - Move slave port logic here. Make slave port as simple as possible.
     This also allows users to build this port with canna support.
   - Set DOCSDIR, so we can use PORTDOCS
   - Since we use PORTDOCS, there is only one line in pkg-plist. Convert
     to PLIST_FILES.
   
   PR:             ports/109333
   Submitted by:   rafan
   Approved by:    KAWAGUTI Ginga <ginga-freebsd at ginganet.org> (maintainer)
   
   Revision  Changes    Path
   1.14      +20 -4     ports/japanese/ng/Makefile
   1.5       +0 -10     ports/japanese/ng/pkg-plist (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
