ports/184873: textproc/tdhkit: Support CC/CFLAGS properly

[KATO Tsuguru]

>Number:         184873
>Category:       ports
>Synopsis:       textproc/tdhkit: Support CC/CFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:20 UTC 2013
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: