1 files changed, 47 insertions, 60 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index b82ef627bfbd..b1dee69a46d4 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.24
-PORTREVISION=	1
+PORTVERSION=	3.5.25.3
 CATEGORIES=	graphics www
-MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
+MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION:R}
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	DjVu viewers and browser plugin
+COMMENT=	DjVu base libraries and utilities
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff
 
 USE_ICONV=	yes
 USE_GNOME=	gnomehack
@@ -28,66 +26,55 @@ CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}" \
-		CXX="${CXX}"
-CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared \
-		--enable-djview
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
 USE_LDCONFIG=	yes
+WRKSRC =	${WRKDIR}/${DISTNAME:R}
 
-INSTALL_TARGET=	install-gui install-i18n
+OPTIONS_DEFINE =	ANY2DJVU
+ANY2DJVU_DESC=		Install any2djvu script (requires curl)
 
-USE_QT_VER=	3
-CONFIGURE_ENV+=	QTLIBS="-L${QT_PREFIX}/lib -lqt-mt"
-MANLANG=	"" ja
-MAN1=		djview3.1 nsdejavu.1
-MLINKS=		djview3.1 djview.1
-DESKTOPDIR=	${PREFIX}/share/djvu/djview3/desktop
+MAN1=		bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
+		djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \
+		djvused.1 djvuserve.1 djvutxt.1
+MAN1_EN=	djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1
 
-USE_WEBPLUGINS=		gecko*
-WEBPLUGINS_DIR=		${PREFIX}/lib/djvulibre/plugins
-WEBPLUGINS_FILES=	nsdejavu.so
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+.if ${PORT_OPTIONS:MANY2DJVU}
+MAN1_EN+=	any2djvu.1
+RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	ANY2DJVU=""
+.else
+PLIST_SUB+=	ANY2DJVU="@comment "
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's,(SUBDIRS_FIRST[[:space:]]+=[[:space:]]+).*,\1,' \
-		-e 's,(SUBDIRS_XML[[:space:]]+=[[:space:]]+).*,\1,' \
-		${WRKSRC}/Makefile.in
-	@${FIND} ${WRKSRC}/i18n/ -name "Makefile.in" | \
-		${XARGS} ${REINPLACE_CMD} -E -e \
-		's,(MANFILES[[:space:]]*=[[:space:]]*).*,\1$${MANFILES_GUI},'
-	@${REINPLACE_CMD} -E -e \
-		's,(LIBDJVU[[:space:]]+=[[:space:]]+).*,\1-ldjvulibre,' \
-		${WRKSRC}/gui/djview/Makefile.in \
-		${WRKSRC}/gui/bin2cpp/Makefile.in \
-		${WRKSRC}/tools/Makefile.in \
-		${WRKSRC}/xmltools/Makefile.in
-	@${REINPLACE_CMD} -e '/-O\*/d ; \
-		 s|$$OPTS -O3|$$OPTS|g ; \
-		 s|$$OPTS -O2|$$OPTS|g ; \
-		 s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/netscape/,/djvulibre/,' \
-		 ${WRKSRC}/gui/nsdejavu/nsdejavu.1.in
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|= @CPPFLAGS|= $${FLAGS} @CPPFLAGS|g ; \
-		 s|@ $${FLAGS}|@|g ; \
-		 s|} $${FLAGS}|}|g ; \
-		 s|/netscape/|/djvulibre/|g ; \
-		 s|eucjp|eucJP|g ; \
-		 s|_PROGRAM} -m|} -m|g'
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/libdjvu/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/-[Og]\*)/d ; \
+		s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \
+		s|$$OPTS $$opt|$$OPTS|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|$${FLAGS}|| ; \
+		s|@CPPFLAGS@|$${FLAGS} &|' \
+		${WRKSRC}/tools/jb2cmp/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|_PROGRAM} -m 0755|_SCRIPT}|' \
+		${WRKSRC}/tools/Makefile.in
+.if empty(PORT_OPTIONS:MANY2DJVU)
+	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
+.endif
+
+.if ${PORT_OPTIONS:MDOC}
+PORTDOCS=	djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu
 
 post-install:
-#
-# Install desktop files.
-#
-	${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/desktopfiles/djvulibre-djview3.desktop \
-		${WRKSRC}/desktopfiles/hi32-djview3.png \
-		${DESKTOPDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/desktopfiles/register-djview-menu \
-		${DESKTOPDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>