Bug 184904 - textproc/humanzip: Fix biuld with clang
Summary: textproc/humanzip: Fix biuld with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-24 16:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.42 KB, patch)
2013-12-16 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:29 UTC
- Fix biuld with clang
- Add LICENSE

New file:
files/patch-humanunzip.cpp
files/patch-humanzip.cpp
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-24 14:35:12 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-24 14:42:43 UTC
Author: pawel
Date: Tue Dec 24 14:42:35 2013
New Revision: 337357
URL: http://svnweb.freebsd.org/changeset/ports/337357

Log:
  - Fix biuld with clang
  - Add LICENSE
  - Support staging
  
  PR:		ports/184904
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/textproc/humanzip/files/
  head/textproc/humanzip/files/patch-humanunzip.cpp   (contents, props changed)
  head/textproc/humanzip/files/patch-humanzip.cpp   (contents, props changed)
Modified:
  head/textproc/humanzip/Makefile   (contents, props changed)
  head/textproc/humanzip/pkg-descr   (contents, props changed)

Modified: head/textproc/humanzip/Makefile
==============================================================================
--- head/textproc/humanzip/Makefile	Tue Dec 24 14:23:21 2013	(r337356)
+++ head/textproc/humanzip/Makefile	Tue Dec 24 14:42:35 2013	(r337357)
@@ -9,22 +9,27 @@ MASTER_SITES=	SAVANNAH CENKES
 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>

Added: head/textproc/humanzip/files/patch-humanunzip.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/humanzip/files/patch-humanunzip.cpp	Tue Dec 24 14:42:35 2013	(r337357)
@@ -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"
+ 

Added: head/textproc/humanzip/files/patch-humanzip.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/humanzip/files/patch-humanzip.cpp	Tue Dec 24 14:42:35 2013	(r337357)
@@ -0,0 +1,9 @@
+--- 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"

Modified: head/textproc/humanzip/pkg-descr
==============================================================================
--- head/textproc/humanzip/pkg-descr	Tue Dec 24 14:23:21 2013	(r337356)
+++ head/textproc/humanzip/pkg-descr	Tue Dec 24 14:42:35 2013	(r337357)
@@ -9,5 +9,4 @@ print size of documents.  Humanzip does 
 size of the file as measured in bytes, although this usually happens 
 incidentally.
 
-Author: Matthew Strait
 WWW: http://savannah.nongnu.org/projects/humanzip/
_______________________________________________
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"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-24 14:42:48 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-24 16:05:00 UTC
Author: mat
Date: Tue Dec 24 16:04:53 2013
New Revision: 337368
URL: http://svnweb.freebsd.org/changeset/ports/337368

Log:
  MFH: r337357
  
  - Fix biuld with clang
  - Add LICENSE
  - Support staging
  
  PR:		ports/184904
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/textproc/humanzip/files/
     - copied from r337357, head/textproc/humanzip/files/
Modified:
  branches/2014Q1/textproc/humanzip/Makefile   (contents, props changed)
  branches/2014Q1/textproc/humanzip/pkg-descr   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/humanzip/Makefile
==============================================================================
--- branches/2014Q1/textproc/humanzip/Makefile	Tue Dec 24 16:03:44 2013	(r337367)
+++ branches/2014Q1/textproc/humanzip/Makefile	Tue Dec 24 16:04:53 2013	(r337368)
@@ -9,22 +9,27 @@ MASTER_SITES=	SAVANNAH CENKES
 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>

Modified: branches/2014Q1/textproc/humanzip/pkg-descr
==============================================================================
--- branches/2014Q1/textproc/humanzip/pkg-descr	Tue Dec 24 16:03:44 2013	(r337367)
+++ branches/2014Q1/textproc/humanzip/pkg-descr	Tue Dec 24 16:04:53 2013	(r337368)
@@ -9,5 +9,4 @@ print size of documents.  Humanzip does 
 size of the file as measured in bytes, although this usually happens 
 incidentally.
 
-Author: Matthew Strait
 WWW: http://savannah.nongnu.org/projects/humanzip/
_______________________________________________
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"