From owner-svn-ports-head@freebsd.org Sun Dec 22 09:06:38 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 72D7D1CE069; Sun, 22 Dec 2019 09:06:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47gc6k2T1Zz4CZM; Sun, 22 Dec 2019 09:06:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B99825363; Sun, 22 Dec 2019 09:06:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBM96c4k062826; Sun, 22 Dec 2019 09:06:38 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBM96bWk062820; Sun, 22 Dec 2019 09:06:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201912220906.xBM96bWk062820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 22 Dec 2019 09:06:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520608 - in head/print/pdftk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/print/pdftk: . files X-SVN-Commit-Revision: 520608 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2019 09:06:38 -0000 Author: tobik Date: Sun Dec 22 09:06:37 2019 New Revision: 520608 URL: https://svnweb.freebsd.org/changeset/ports/520608 Log: print/pdftk: Update to 3.0.8 of JDK-based fork The fork is a pure Java implementation of pdftk and does not rely on the obsolete GCJ. It is mostly compatible with the old version. The old version was the last port still depending on lang/gcc6. Changes: https://gitlab.com/pdftk-java/pdftk/blob/v3.0.8/CHANGELOG.md#308-2019-10-14 Added: head/print/pdftk/files/pdftk.in (contents, props changed) Deleted: head/print/pdftk/files/patch-pdftk__Makefile.Base Modified: head/print/pdftk/Makefile head/print/pdftk/distinfo head/print/pdftk/pkg-descr Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Sun Dec 22 08:30:24 2019 (r520607) +++ head/print/pdftk/Makefile Sun Dec 22 09:06:37 2019 (r520608) @@ -2,53 +2,52 @@ # $FreeBSD$ PORTNAME= pdftk -PORTVERSION= 2.02 -PORTREVISION= 8 -CATEGORIES= print -MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ LOCAL/mat/pdftk -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTVERSIONPREFIX= v +DISTVERSION= 3.0.8 +CATEGORIES= print java +MASTER_SITES= http://repo.maven.apache.org/maven2/:bcprov +DISTFILES= ${_BCPROV_JAR}:bcprov -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= Simple tool for doing everyday things with PDF documents LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE -# Get GCC version suffix without the dot in USE_GCC -CSUFF= ${_USE_GCC:S/.//} +BUILD_DEPENDS= ${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 +RUN_DEPENDS= ${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 -USE_GCC= 6 # Only GCC 6 provides Java (GCJ and libgcj). -USES= iconv gmake zip +USE_ANT= yes +USE_GITLAB= yes +GL_ACCOUNT= pdftk-java +GL_COMMIT= c98f90e623376942b5a0e9c77345e11710e50509 +USE_JAVA= yes +ALL_TARGET= jar +NO_ARCH= yes +SUB_FILES= pdftk +SUB_LIST= CLASSPATH="${_CLASSPATH:ts:}" \ + JAVA="${JAVA}" +PLIST_FILES= ${JAVAJARDIR}/${_BCPROV_JAR:T} \ + ${JAVAJARDIR}/pdftk.jar \ + bin/pdftk \ + man/man1/pdftk.1.gz -# gcj/libgcj don't exist on some platforms -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= GNU gcj does not exist on this platform +_BCPROV_JAR= org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar +_CLASSPATH= ${JAVAJARDIR}/${_BCPROV_JAR:T} ${JAVAJARDIR}/commons-lang3.jar \ + ${JAVAJARDIR}/pdftk.jar -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-dist -WRKSRC= ${PATCH_WRKSRC}/${PORTNAME} +post-extract: + @${MKDIR} ${WRKSRC}/lib + @${LN} -sf ${JAVAJARDIR}/commons-lang3.jar ${WRKSRC}/lib + @${LN} -sf ${DISTDIR}/${_BCPROV_JAR} ${WRKSRC}/lib -MAKEFILE= Makefile.FreeBSD -MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} GCPP=cpp${CSUFF} \ - OBJCOPY=${OBJCOPY} - -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz - -pre-configure: - @if [ ! -e ${LOCALBASE}/bin/gcj${CSUFF} ]; then \ - ${ECHO_MSG} ""; \ - ${ECHO_MSG} "Cannot find gcj${CSUFF}"; \ - ${ECHO_MSG} "Please rebuild ${_GCC_PORT} with java support"; \ - ${ECHO_MSG} ""; \ - exit 1; \ - fi - -post-patch: - @${REINPLACE_CMD} -e "s|TOOLPATH=|TOOLPATH=${LOCALBASE}/bin/|g; \ - s|VERSUFF=|VERSUFF=${CSUFF}|g; s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib ${LDFLAGS} -w|g; \ - s|LDLIBS= -lgcj|LDLIBS= -lgcj -pthread ${ICONV_LIB} -lz -L${LOCALBASE}/lib ${LDFLAGS} -w|g" \ - ${WRKSRC}/${MAKEFILE} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/../${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKDIR}/pdftk \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/build/jar/pdftk.jar \ + ${DISTDIR}/${_BCPROV_JAR} \ + ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_MAN} ${WRKSRC}/pdftk.1 \ + ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/print/pdftk/distinfo ============================================================================== --- head/print/pdftk/distinfo Sun Dec 22 08:30:24 2019 (r520607) +++ head/print/pdftk/distinfo Sun Dec 22 09:06:37 2019 (r520608) @@ -1,2 +1,5 @@ -SHA256 (pdftk-2.02-src.zip) = 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 -SIZE (pdftk-2.02-src.zip) = 2239008 +TIMESTAMP = 1577004031 +SHA256 (org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar) = 8748f0ec73895f7f18c1a9c13cf754fddddf0451cf472463ef02f93c3e7a7de7 +SIZE (org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar) = 2842667 +SHA256 (pdftk-java-pdftk-c98f90e623376942b5a0e9c77345e11710e50509_GL0.tar.gz) = 7afd3ff60062554038d8e035f710838ff0159720315a9fe2198591239dc8f586 +SIZE (pdftk-java-pdftk-c98f90e623376942b5a0e9c77345e11710e50509_GL0.tar.gz) = 1359740 Added: head/print/pdftk/files/pdftk.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/pdftk/files/pdftk.in Sun Dec 22 09:06:37 2019 (r520608) @@ -0,0 +1,2 @@ +#!/bin/sh +exec "%%JAVA%%" $JAVA_OPTS -classpath "%%CLASSPATH%%" com.gitlab.pdftk_java.pdftk "$@" Modified: head/print/pdftk/pkg-descr ============================================================================== --- head/print/pdftk/pkg-descr Sun Dec 22 08:30:24 2019 (r520607) +++ head/print/pdftk/pkg-descr Sun Dec 22 09:06:37 2019 (r520608) @@ -12,8 +12,4 @@ Report on PDF Metrics, including Metadata and Bookmark Uncompress and Re-Compress Page Streams Repair Corrupted PDF (Where Possible) -Pdftk is also an example of how to use a library of Java classes -in a stand-alone C++ program. Specifically, it demonstrates how GCJ and CNI -allow C++ code to use iText's (itext-paulo) Java classes. - -WWW: http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ +WWW: https://gitlab.com/pdftk-java/pdftk