svn commit: r358756 - in head/graphics/jbigkit: . files

[Antoine Brodin]

Author: antoine
Date: Sat Jun 21 23:15:26 2014
New Revision: 358756
URL: http://svnweb.freebsd.org/changeset/ports/358756
QAT: https://qat.redports.org/buildarchive/r358756/

Log:
  - Unbreak
  - Package man pages
  - Convert to OPTIONS
  - Strip shared libs
  
  Pointyhats:	mi@

Modified:
  head/graphics/jbigkit/Makefile
  head/graphics/jbigkit/files/patch-aa
  head/graphics/jbigkit/pkg-plist

Modified: head/graphics/jbigkit/Makefile
==============================================================================
--- head/graphics/jbigkit/Makefile	Sat Jun 21 22:15:17 2014	(r358755)
+++ head/graphics/jbigkit/Makefile	Sat Jun 21 23:15:26 2014	(r358756)
@@ -10,29 +10,32 @@ MAINTAINER=	mi at aldan.algebra.com
 COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
 
 USE_LDCONFIG=	yes
-MAN1=	jbgtopbm.1 pbmtojbg.1
-BINS=	jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85
-LIBS=	libjbig.a libjbig.so.2 libjbig85.a libjbig85.so.1
+MANS=		jbgtopbm.1 pbmtojbg.1
+BINS=		jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85
+LIBA=		libjbig.a libjbig85.a
+LIBS=		libjbig.so.2 libjbig85.so.1
 DOCSDIR?=	${PREFIX}/share/doc/jbig
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM}	\
 		${BINS:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${PREFIX}/bin
 
 	${INSTALL_MAN}	\
-		${MAN1:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${MANPREFIX}/man/man1
+		${MANS:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${MANPREFIX}/man/man1
 
 	${INSTALL_DATA} ${WRKSRC}/libjbig/*.h ${STAGEDIR}${PREFIX}/include
 
 	${INSTALL_DATA}	\
+		${LIBA:S|^|${WRKSRC}/libjbig/|} ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB}	\
 		${LIBS:S|^|${WRKSRC}/libjbig/|} ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libjbig.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig.so
 	${LN} -sf libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig85.so
 
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 regression-test test:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test

Modified: head/graphics/jbigkit/files/patch-aa
==============================================================================
--- head/graphics/jbigkit/files/patch-aa	Sat Jun 21 22:15:17 2014	(r358755)
+++ head/graphics/jbigkit/files/patch-aa	Sat Jun 21 23:15:26 2014	(r358756)
@@ -1,6 +1,7 @@
---- Makefile	2014-03-27 14:47:15.000000000 -0400
-+++ Makefile	2014-04-08 08:37:59.000000000 -0400
-@@ -2,12 +2,10 @@
+--- ./Makefile.orig	2014-03-27 18:47:15.000000000 +0000
++++ ./Makefile	2014-06-21 22:53:57.000000000 +0000
+@@ -1,24 +1,22 @@
+ # Unix makefile for JBIG-KIT
  
  # Select an ANSI/ISO C compiler here, GNU gcc is recommended
 -CC = gcc
@@ -15,3 +16,16 @@
 -
  VERSION=2.1
  
+ all: lib pbm
+ 	@echo "Enter 'make test' in order to start some automatic tests."
+ 
+ lib:
+-	cd libjbig && $(MAKE) -e
++	cd libjbig && $(MAKE)
+ 
+ pbm: lib
+-	cd pbmtools && $(MAKE) -e
++	cd pbmtools && $(MAKE)
+ 
+ test: lib pbm
+ 	cd libjbig  && $(MAKE) test

Modified: head/graphics/jbigkit/pkg-plist
==============================================================================
--- head/graphics/jbigkit/pkg-plist	Sat Jun 21 22:15:17 2014	(r358755)
+++ head/graphics/jbigkit/pkg-plist	Sat Jun 21 23:15:26 2014	(r358756)
@@ -11,5 +11,7 @@ lib/libjbig.so.2
 lib/libjbig85.a
 lib/libjbig85.so
 lib/libjbig85.so.1
+man/man1/jbgtopbm.1.gz
+man/man1/pbmtojbg.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/jbig.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%