4 files changed, 47 insertions, 10 deletions

diff --git a/print/pdflib-perl/Makefile b/print/pdflib-perl/Makefile
index 7ae1aaec2f5a..79dd020124f5 100644
--- a/print/pdflib-perl/Makefile
+++ b/print/pdflib-perl/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print perl
+PKGNAMESUFFIX=	-perl
 
 MAINTAINER=	ale@FreeBSD.org
 
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 2bb0f070f136..ac26197991d5 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	7.0.5
-CATEGORIES=	print
+CATEGORIES=	print perl java
 MASTER_SITES=	http://www.pdflib.com/binaries/PDFlib/${PORTVERSION:S/.//g}/
 DISTNAME=	PDFlib-Lite-${PORTVERSION}
 
@@ -16,32 +16,52 @@ COMMENT=	A C library for dynamically generating PDF
 
 RESTRICTED=	many odd restrictions on usage and distribution
 
+.if defined(WITH_PERL)
+OPTIONS=	PERL "Build perl bindings" on
+.else
+OPTIONS=	PERL "Build perl bindings" off
+.endif
+OPTIONS+=	JAVA "Build Java bindings" off
+
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-java=no --with-py=no --with-ruby=no --with-tcl=no
+CONFIGURE_ARGS=	--with-py=no --with-ruby=no --with-tcl=no
+
+PORTDOCS=	*
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+CONFIGURE_ARGS+=--enable-64bit
+.endif
 
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 PLIST_SUB=	PERL=""
 CONFIGURE_ARGS+=--with-perl=${PERL}
-PKGNAMESUFFIX=	-perl
 .else
 CONFIGURE_ARGS+=--with-perl=no
 PLIST_SUB=	PERL="@comment "
 .endif
 
-PORTDOCS=	*
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=--enable-64bit
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+PLIST_SUB+=	JAVA=""
+CONFIGURE_ARGS+=--with-java=${JAVA_HOME}
+.else
+CONFIGURE_ARGS+=--with-java=no
+PLIST_SUB+=	JAVA="@comment "
 .endif
 
 post-install:
 	${MKDIR} ${DATADIR}/fonts
 	${INSTALL_DATA} ${WRKSRC}/fonts/* ${DATADIR}/fonts
+.if defined(WITH_JAVA)
+ 	${INSTALL_DATA} ${WRKSRC}/bind/pdflib/java/pdflib.jar ${JAVAJARDIR}/pdflib.jar
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/pdflib/* ${DOCSDIR}
diff --git a/print/pdflib/files/patch-configure b/print/pdflib/files/patch-configure
new file mode 100644
index 000000000000..a258d98b9731
--- /dev/null
+++ b/print/pdflib/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	2012-01-10 12:18:55.000000000 +0100
++++ configure	2012-01-10 12:20:13.000000000 +0100
+@@ -21416,6 +21416,9 @@
+ if test "$WITH_CXX" = "yes" ; then
+     BINDINGS="$BINDINGS cpp"
+ fi
++if test "$WITH_PERL" = "yes" ; then
++    BINDINGS="$BINDINGS perl"
++fi
+ if test "$WITH_JAVA" = "yes" ; then
+     BINDINGS="$BINDINGS java"
+     PLOPBINDINGS="$PLOPBINDINGS java"
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index c4eba748e043..d6fcabae97f0 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -11,6 +11,11 @@ lib/libpdf.so.6
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.la
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%JAVA%%lib/libpdf_java.a
+%%JAVA%%lib/libpdf_java.la
+%%JAVA%%lib/libpdf_java.so.0
+%%JAVA%%lib/libpdf_java.so
+%%JAVA%%%%JAVAJARDIR%%/pdflib.jar
 %%DATADIR%%/fonts/pdflib.upr
 %%DATADIR%%/fonts/print_glyphs.ps
 @dirrm share/pdflib/fonts