From tkato432@yahoo.com  Mon Dec 16 18:08:20 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 92AAB5F3
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:06:25 +0000 (UTC)
Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id 52C1F18C0
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:06:25 +0000 (UTC)
Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 22F5F98018D
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 17 Dec 2013 03:06:23 +0900 (JST)
Message-Id: <20131217025130.68be02158f51f2a44fa08df1@yahoo.com>
Date: Tue, 17 Dec 2013 02:51:30 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: textproc/tdhkit: Support CC/CFLAGS properly

>Number:         184873
>Category:       ports
>Synopsis:       textproc/tdhkit: Support CC/CFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:20 UTC 2013
>Closed-Date:    Fri Dec 20 18:21:48 UTC 2013
>Last-Modified:  Fri Dec 20 18:30:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
- Add LICENSE

New file:
files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/tdhkit/Makefile textproc/tdhkit/Makefile
--- /usr/ports/textproc/tdhkit/Makefile	2013-11-06 21:54:57.000000000 +0900
+++ textproc/tdhkit/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,6 +3,7 @@
 
 PORTNAME=	tdhkit
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://quisp.sourceforge.net/${PORTNAME}/
 DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//1}
@@ -10,65 +11,42 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of programs for working with tabular ASCII data
 
-OPTIONS_DEFINE=	LIBCHRON DOCS
-LIBCHRON_DESC=	Install libchron
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	CHRON DOCS
+OPTIONS_SUB=	yes
+CHRON_DESC=	Install libchron
+
+BUILD_WRKSRC=	${WRKSRC}/src
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLIBCHRON}
-PLIST_SUB+=	LIBCHRON=""
-.else
-PLIST_SUB+=	LIBCHRON="@comment "
-.endif
-
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		dateconvert.1 \
-		fldfmt.1 \
-		fldmap.1 \
-		fldsel.1 \
-		pjoin.1 \
-		recsel.1 \
-		tabo.1 \
-		tdhfunction.1 \
-		xlcells.1 \
-		xlcleaner.1
-
-.if ${PORT_OPTIONS:MLIBCHRON}
-MAN3=		libchron.3
-.endif
-MANCOMPRESSED=	no
-.endif
-
-do-build:
-	cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-.if ${PORT_OPTIONS:MLIBCHRON}
-	cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} libchron
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS =|CFLAGS +=|' \
+		${WRKSRC}/libsrc/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS =|CFLAGS +=| ; \
+		 s|^CC =|CC ?=| ; \
+		 /^all:/s|recsel fldsel|recsel fldmap fldsel|' \
+		${BUILD_WRKSRC}/Makefile
+
+pre-build:
+	@(cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} \
+		${MAKE_ARGS} default libchron)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
-
-.if ${PORT_OPTIONS:MLIBCHRON}
-	${INSTALL_PROGRAM} ${WRKSRC}/libchron.a ${PREFIX}/lib
-.endif
-
-.if !defined(NO_INSTALL_MANPAGES)
-.for manpage in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/mantdh/${manpage} ${MAN1PREFIX}/man/man1
-.endfor
-.if ${PORT_OPTIONS:MLIBCHRON}
-	${INSTALL_MAN} ${WRKSRC}/man/mantdh/${MAN3} ${MAN3PREFIX}/man/man3
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/man/html/* ${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} libchron.a \
+		${STAGEDIR}${PREFIX}/lib)
+	(cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1)
+	(cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.3 \
+		${STAGEDIR}${MAN3PREFIX}/man/man3)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/man/html && ${INSTALL_DATA} * \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/tdhkit/files/patch-Makefile textproc/tdhkit/files/patch-Makefile
--- /usr/ports/textproc/tdhkit/files/patch-Makefile	2013-11-06 21:54:57.000000000 +0900
+++ textproc/tdhkit/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2010-03-02 15:09:45.000000000 -0800
-+++ src/Makefile	2010-03-02 15:10:08.000000000 -0800
-@@ -6,7 +6,7 @@
- CC = gcc
- 
- 
--all: recsel fldsel fldfmt pjoin tabo dateconvert tdhfunction xlcleaner xlcells 
-+all: recsel fldmap fldsel fldfmt pjoin tabo dateconvert tdhfunction xlcleaner xlcells 
- 
- 
- # FLDMAP -
diff -urN /usr/ports/textproc/tdhkit/pkg-plist textproc/tdhkit/pkg-plist
--- /usr/ports/textproc/tdhkit/pkg-plist	2013-11-06 21:54:57.000000000 +0900
+++ textproc/tdhkit/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -8,7 +8,18 @@
 bin/tdhfunction
 bin/xlcells
 bin/xlcleaner
-%%LIBCHRON%%lib/libchron.a
+%%CHRON%%lib/libchron.a
+man/man1/dateconvert.1.gz
+man/man1/fldfmt.1.gz
+man/man1/fldmap.1.gz
+man/man1/fldsel.1.gz
+man/man1/pjoin.1.gz
+man/man1/recsel.1.gz
+man/man1/tabo.1.gz
+man/man1/tdhfunction.1.gz
+man/man1/xlcells.1.gz
+man/man1/xlcleaner.1.gz
+man/man3/libchron.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/commalist.html
 %%PORTDOCS%%%%DOCSDIR%%/condex.html
@@ -32,4 +43,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/times.html
 %%PORTDOCS%%%%DOCSDIR%%/xlcells.1.html
 %%PORTDOCS%%%%DOCSDIR%%/xlcleaner.1.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Dec 20 18:14:19 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184873 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Dec 20 18:21:47 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184873: commit references a PR
Date: Fri, 20 Dec 2013 18:21:12 +0000 (UTC)

 Author: pawel
 Date: Fri Dec 20 18:21:04 2013
 New Revision: 337059
 URL: http://svnweb.freebsd.org/changeset/ports/337059
 
 Log:
   - Support CC/CFLAGS properly
   - Add LICENSE
   - Support staging
   
   PR:		ports/184873
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Deleted:
   head/textproc/tdhkit/files/
 Modified:
   head/textproc/tdhkit/Makefile   (contents, props changed)
   head/textproc/tdhkit/pkg-plist   (contents, props changed)
 
 Modified: head/textproc/tdhkit/Makefile
 ==============================================================================
 --- head/textproc/tdhkit/Makefile	Fri Dec 20 18:18:37 2013	(r337058)
 +++ head/textproc/tdhkit/Makefile	Fri Dec 20 18:21:04 2013	(r337059)
 @@ -10,65 +10,40 @@ DISTNAME=	${PORTNAME}${PORTVERSION:C/\./
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Set of programs for working with tabular ASCII data
  
 -OPTIONS_DEFINE=	LIBCHRON DOCS
 -LIBCHRON_DESC=	Install libchron
 +LICENSE=	GPLv2 # (or later)
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 -
 -.if ${PORT_OPTIONS:MLIBCHRON}
 -PLIST_SUB+=	LIBCHRON=""
 -.else
 -PLIST_SUB+=	LIBCHRON="@comment "
 -.endif
 -
 -.if !defined(NO_INSTALL_MANPAGES)
 -MAN1=		dateconvert.1 \
 -		fldfmt.1 \
 -		fldmap.1 \
 -		fldsel.1 \
 -		pjoin.1 \
 -		recsel.1 \
 -		tabo.1 \
 -		tdhfunction.1 \
 -		xlcells.1 \
 -		xlcleaner.1
 -
 -.if ${PORT_OPTIONS:MLIBCHRON}
 -MAN3=		libchron.3
 -.endif
 -MANCOMPRESSED=	no
 -.endif
 -
 -do-build:
 -	cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \
 -		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 -	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
 -		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 -.if ${PORT_OPTIONS:MLIBCHRON}
 -	cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \
 -		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} libchron
 -.endif
 +OPTIONS_DEFINE=	CHRON DOCS
 +OPTIONS_SUB=	yes
 +CHRON_DESC=	Install libchron
 +
 +BUILD_WRKSRC=	${WRKSRC}/src
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|^CFLAGS =|CFLAGS +=|' \
 +		${WRKSRC}/libsrc/Makefile
 +	@${REINPLACE_CMD} -e \
 +		's|^CFLAGS =|CFLAGS +=| ; \
 +		 s|^CC =|CC ?=| ; \
 +		 /^all:/s|recsel fldsel|recsel fldmap fldsel|' \
 +		${BUILD_WRKSRC}/Makefile
 +
 +pre-build:
 +	@(cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 +		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} \
 +		${MAKE_ARGS} default libchron)
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
 -
 -.if ${PORT_OPTIONS:MLIBCHRON}
 -	${INSTALL_PROGRAM} ${WRKSRC}/libchron.a ${PREFIX}/lib
 -.endif
 -
 -.if !defined(NO_INSTALL_MANPAGES)
 -.for manpage in ${MAN1}
 -	${INSTALL_MAN} ${WRKSRC}/man/mantdh/${manpage} ${MAN1PREFIX}/man/man1
 -.endfor
 -.if ${PORT_OPTIONS:MLIBCHRON}
 -	${INSTALL_MAN} ${WRKSRC}/man/mantdh/${MAN3} ${MAN3PREFIX}/man/man3
 -.endif
 -.endif
 -
 -.if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/man/html/* ${DOCSDIR}
 -.endif
 +	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * \
 +		${STAGEDIR}${PREFIX}/bin)
 +	(cd ${WRKSRC} && ${INSTALL_DATA} libchron.a \
 +		${STAGEDIR}${PREFIX}/lib)
 +	(cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.1 \
 +		${STAGEDIR}${MAN1PREFIX}/man/man1)
 +	(cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.3 \
 +		${STAGEDIR}${MAN3PREFIX}/man/man3)
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC}/man/html && ${INSTALL_DATA} * \
 +		${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 
 Modified: head/textproc/tdhkit/pkg-plist
 ==============================================================================
 --- head/textproc/tdhkit/pkg-plist	Fri Dec 20 18:18:37 2013	(r337058)
 +++ head/textproc/tdhkit/pkg-plist	Fri Dec 20 18:21:04 2013	(r337059)
 @@ -8,7 +8,18 @@ bin/tabo
  bin/tdhfunction
  bin/xlcells
  bin/xlcleaner
 -%%LIBCHRON%%lib/libchron.a
 +%%CHRON%%lib/libchron.a
 +man/man1/dateconvert.1.gz
 +man/man1/fldfmt.1.gz
 +man/man1/fldmap.1.gz
 +man/man1/fldsel.1.gz
 +man/man1/pjoin.1.gz
 +man/man1/recsel.1.gz
 +man/man1/tabo.1.gz
 +man/man1/tdhfunction.1.gz
 +man/man1/xlcells.1.gz
 +man/man1/xlcleaner.1.gz
 +man/man3/libchron.3.gz
  %%PORTDOCS%%%%DOCSDIR%%/Copyright.html
  %%PORTDOCS%%%%DOCSDIR%%/commalist.html
  %%PORTDOCS%%%%DOCSDIR%%/condex.html
 @@ -32,4 +43,4 @@ bin/xlcleaner
  %%PORTDOCS%%%%DOCSDIR%%/times.html
  %%PORTDOCS%%%%DOCSDIR%%/xlcells.1.html
  %%PORTDOCS%%%%DOCSDIR%%/xlcleaner.1.html
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
