svn commit: r335189 - in head/print/pdftk: . files

[Mathieu Arnold]

Author: mat
Date: Fri Nov 29 15:48:07 2013
New Revision: 335189
URL: http://svnweb.freebsd.org/changeset/ports/335189

Log:
  Updated port to pdftk-2.02
  
  Changes:
  - Removed LOCAL master site, no distfile there obviously
  - Moved USE_ZIP after BUILD_DEPENDS due to portlint warning
  - Added LICENSE due to portlint warning
  - Added LIB_DEPENDS. Libraries provided by gcc required to run the binary, but gcc is registered only as build dependency. Removing the gcc after installation of pdftk is permitted but breaks pdftk
  - The port doesn't install any shared libraries, so there's no point in USE_LDCONFIG
  - Changed PLIST_FILES and removed MAN1 to support staging
  - Removed ancient comment (mentioned gcc and FreeBSD versions are deprecated long ago)
  - Prepended STAGEDIR before PREFIX to support staging
  - Corrected patch-pdftk__Makefile.Base to support new version
  - REMOVED FILE file/patch-pdftk__Makefile.FreeBSD (is now provided by upstream)
  - REMOVED FILE file/patch-java__Makefile (patch included by upstream)
  
  maintainer timeout.
  
  PR:		ports/183578
  Submitted by:	Kozlov Sergey

Deleted:
  head/print/pdftk/files/patch-java__Makefile
  head/print/pdftk/files/patch-pdftk__Makefile.FreeBSD
Modified:
  head/print/pdftk/Makefile
  head/print/pdftk/distinfo
  head/print/pdftk/files/patch-pdftk__Makefile.Base

Modified: head/print/pdftk/Makefile
==============================================================================
--- head/print/pdftk/Makefile	Fri Nov 29 15:16:28 2013	(r335188)
+++ head/print/pdftk/Makefile	Fri Nov 29 15:48:07 2013	(r335189)
@@ -2,29 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	pdftk
-PORTVERSION=	1.45
-PORTREVISION=	1
+PORTVERSION=	2.02
 CATEGORIES=	print
-MASTER_SITES=	http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ \
-		LOCAL/glarkin
+MASTER_SITES=	http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	glarkin at FreeBSD.org
 COMMENT=	Simple tool for doing everyday things with PDF documents
 
-USE_ZIP=	yes
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libgcj.so:${PORTSDIR}/lang/gcc${CSUFF} \
+		libstdc++.so:${PORTSDIR}/lang/gcc${CSUFF} \
+		libgcc_s.so:${PORTSDIR}/lang/gcc${CSUFF}
 
 BUILD_DEPENDS=	gcj${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
 		gcjh${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
 		cpp${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF}
 
+USE_ZIP=	yes
+
 # Get GCC version suffix without the dot in USE_GCC
 CSUFF=		${_USE_GCC:S/.//}
 
 USE_GCC=	yes
-USE_GMAKE=	yes
-USES=		iconv
-USE_LDCONFIG=	${PREFIX}/lib/gcc${CSUFF}
+USES=		iconv gmake
 
 # gcj/libgcj don't exist on some platforms
 ONLY_FOR_ARCHS=		i386 amd64
@@ -42,15 +44,6 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/${
 post-patch:
 	@${REINPLACE_CMD} -e "s|TOOLPATH=|TOOLPATH=${LOCALBASE}/bin/|g" ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e "s|VERSUFF=|VERSUFF=${CSUFF}|g" ${WRKSRC}/${MAKEFILE}
-
-#2005-10-29 - mjoyner at vbservices.net/mjoyner at ewc.edu
-#as shipped, pdftk compiles fine with 3.4 gcj, as we currently only have 4.1 gcj available,
-#fix things so that it will compile. (compile tested on 5.4-STABLE)
-#
-#The resulting binary from using the 4.1 compiler suite has *NOT* been regression tested!
-#Based on info found via Google USENET Search: Adam McDougall, Gerald Pfeifer
-#
-
 	@${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e "s|LDLIBS= -lgcj|LDLIBS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} ${ICONV_LIB} -lz -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" \
 			${WRKSRC}/${MAKEFILE}

Modified: head/print/pdftk/distinfo
==============================================================================
--- head/print/pdftk/distinfo	Fri Nov 29 15:16:28 2013	(r335188)
+++ head/print/pdftk/distinfo	Fri Nov 29 15:48:07 2013	(r335189)
@@ -1,2 +1,2 @@
-SHA256 (pdftk-1.45-src.zip) = f4e1a50a9ae748dc71883182b797c80c497884fb3071e564361af57354378fcf
-SIZE (pdftk-1.45-src.zip) = 1159411
+SHA256 (pdftk-2.02-src.zip) = 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1
+SIZE (pdftk-2.02-src.zip) = 2239008

Modified: head/print/pdftk/files/patch-pdftk__Makefile.Base
==============================================================================
--- head/print/pdftk/files/patch-pdftk__Makefile.Base	Fri Nov 29 15:16:28 2013	(r335188)
+++ head/print/pdftk/files/patch-pdftk__Makefile.Base	Fri Nov 29 15:48:07 2013	(r335189)
@@ -1,8 +1,8 @@
---- ./pdftk/Makefile.Base.orig	2010-11-17 14:25:44.000000000 -0500
-+++ ./pdftk/Makefile.Base	2010-11-17 14:27:49.000000000 -0500
-@@ -29,21 +29,21 @@
+--- pdftk/Makefile.Base.orig	2013-10-13 16:59:09.000000000 +0300
++++ pdftk/Makefile.Base	2013-10-13 17:14:39.000000000 +0300
+@@ -28,24 +28,24 @@
  #
- CPPFLAGS+= -DPDFTK_VER=\"1.44\"
+ CPPFLAGS+= -DPDFTK_VER=\"2.02\"
  
 -all : javalib pdftk
 +all : pdftk
@@ -18,12 +18,16 @@
 +report.o : javalib report.cc report.h pdftk.h
  	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) report.cc -c
  
--pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
-+pdftk.o : javalib pdftk.cc pdftk.h attachments.h report.h $(GCJ_LOCAL_LIB_FULL)
+-passwords.o : passwords.cc passwords.h pdftk.h $(JAVALIB)
++passwords.o : javalib passwords.cc passwords.h pdftk.h
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) passwords.cc -c
+ 
+-pdftk.o : pdftk.cc pdftk.h attachments.h report.h passwords.h $(JAVALIB)
++pdftk.o : javalib pdftk.cc pdftk.h attachments.h report.h passwords.h
  	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
  
--pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
-+pdftk : javalib pdftk.o attachments.o report.o $(GCJ_LOCAL_LIB_FULL)
- 	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
+-pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O)
++pdftk : javalib pdftk.o attachments.o report.o passwords.o $(LIBGCJ_SUPPLEMENT_FULL_O)
+ 	$(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
  
  install: