Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 02:51:23 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/184904: textproc/humanzip: Fix biuld with clang
Message-ID:  <20131217025123.ca94b61c37625edd1787bc48@yahoo.com>
Resent-Message-ID: <201312161810.rBGIATx2016681@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184904
>Category:       ports
>Synopsis:       textproc/humanzip: Fix biuld with clang
>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:29 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix biuld with clang
- Add LICENSE

New file:
files/patch-humanunzip.cpp
files/patch-humanzip.cpp

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/humanzip/Makefile textproc/humanzip/Makefile
--- /usr/ports/textproc/humanzip/Makefile	2013-11-06 21:55:13.000000000 +0900
+++ textproc/humanzip/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -9,22 +9,27 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compresses text to human readable output
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|g++|${CXX}|;s|-O2|${CFLAGS}|' \
-		${WRKSRC}/${MAKEFILE}
+LICENSE=	GPLv2 # (or later)
 
-MAN1=	${PORTNAME}.1
-MLINKS=	${PORTNAME}.1 humanunzip.1
-PLIST_FILES=	bin/${PORTNAME} bin/humanunzip
 PORTDOCS=	CHANGELOG README TODO
+PLIST_FILES=	bin/humanunzip bin/humanzip \
+		man/man1/humanunzip.1.gz man/man1/humanzip.1.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|g++|$${CXX}| ; \
+		 s|-O2|$${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/human*zip ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+.for i in humanzip humanunzip
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
+.endfor
+	(cd ${WRKSRC} && ${INSTALL_MAN} humanzip.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1)
+	${LN} -sf humanzip.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/humanunzip.1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/humanzip/files/patch-humanunzip.cpp textproc/humanzip/files/patch-humanunzip.cpp
--- /usr/ports/textproc/humanzip/files/patch-humanunzip.cpp	1970-01-01 09:00:00.000000000 +0900
+++ textproc/humanzip/files/patch-humanunzip.cpp	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- humanunzip.cpp.orig
++++ humanunzip.cpp
+@@ -22,6 +22,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <vector>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "humanzip.h"
+ 
diff -urN /usr/ports/textproc/humanzip/files/patch-humanzip.cpp textproc/humanzip/files/patch-humanzip.cpp
--- /usr/ports/textproc/humanzip/files/patch-humanzip.cpp	1970-01-01 09:00:00.000000000 +0900
+++ textproc/humanzip/files/patch-humanzip.cpp	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- humanzip.cpp.orig
++++ humanzip.cpp
+@@ -24,6 +24,7 @@
+ #include <getopt.h>
+ #include <vector>
+ #include <iomanip>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "humanzip.h"
+ 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217025123.ca94b61c37625edd1787bc48>