diff -urN /usr/ports/graphics/djvulibre/Makefile graphics/djvulibre/Makefile --- /usr/ports/graphics/djvulibre/Makefile Wed Nov 16 03:35:04 2005 +++ graphics/djvulibre/Makefile Fri Nov 18 23:18:44 2005 @@ -6,7 +6,7 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.15 +PORTVERSION= 3.5.16 CATEGORIES= graphics www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= djvu @@ -14,79 +14,76 @@ MAINTAINER= ports@FreeBSD.org COMMENT?= DjVu viewers, encoders, browser plugin, and utilities -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - tiff:${PORTSDIR}/graphics/tiff - -.if !defined(WITHOUT_X11) -USE_X_PREFIX= yes -USE_QT_VER= 3 -.else -PKGNAMESUFFIX= -nox11 -.endif +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + tiff.4:${PORTSDIR}/graphics/tiff +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_AUTOTOOLS= autoconf:259 libtool:15:inc -INSTALLS_SHLIB= yes -DATADIR= ${PREFIX}/share/djvu +USE_REINPLACE= yes +USE_AUTOTOOLS= libtool:15 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ TIFF_CFLAGS="-I${LOCALBASE}/include" \ - TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" -CONFIGURE_ARGS= --enable-threads=pthread --enable-shared --prefix="${PREFIX}" - -.if !defined(WITHOUT_X11) -CONFIGURE_ENV+= CXX=${CXX} \ + TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ - QTLIBS="-L${X11BASE}/lib -lqt-mt" -.else -CONFIGURE_ARGS+=--disable-djview --without-x -.endif - -.if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local" -pre-configure: - ${PERL5} -pi -e 's,/usr/local,${LOCALBASE},g' `${FIND} ${WRKSRC} \ - -type f -print0 | ${XARGS} -0 ${GREP} -Fl --mmap /usr/local` -.endif - -patch-autotools: - @cd ${PATCH_WRKSRC}; ${LIBTOOLIZE} -f >/dev/null - -post-patch: - @${RM} ${WRKSRC}/tools/any2djvu.* + CXX="${CXX}" +CONFIGURE_ARGS= --enable-threads=pthread --enable-shared +INSTALLS_SHLIB= yes -post-configure: - ${PERL5} -pi -e 's,-O3,,;' -e 's,-m.+=i386,,;' \ - -e 's|^(OPTS =.*)|\1 ${CFLAGS}|' \ - ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile +MANLANG= "" ja +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 +MAN1EXTRA= any2djvu.1 djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 +MAN1+= ${MAN1EXTRA} -PORTDOCS= djvu2spec.djvu djvu3changes.txt lizard2002.djvu \ +PORTDOCS= djvu2spec.djvu djvu3changes.txt lizard2002.djvu \ lizard2003-navm.djvu lizard2005-antz.djvu -MANLANG="" ja -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 -MAN1EXTRA= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 -MAN1+= ${MAN1EXTRA} - -PLIST_SUB+= MAJOR_VERSION=${PORTVERSION:E} .if !defined(WITHOUT_X11) -MAN1+= djview.1 nsdejavu.1 +USE_QT_VER= 3 +CONFIGURE_ENV+= QTLIBS="-L${X11BASE}/lib -lqt-mt" +MAN1+= djview.1 nsdejavu.1 PLIST_SUB+= X11='' .else +PKGNAMESUFFIX= -nox11 +CONFIGURE_ARGS+= --disable-djview --without-x PLIST_SUB+= X11='@comment ' .endif +post-patch: + @${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|^#! /bin/bash|#! ${LOCALBASE}/bin/bash|g ; \ + s|any2djvu\.sh|any2djvu|g' ${WRKSRC}/tools/any2djvu + @${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' + post-install: .for man1 in ${MAN1EXTRA} .for manlang in ${MANLANG} ${TOUCH} ${MAN1PREFIX}/man/${manlang}/man1/${man1} .endfor .endfor +.if !defined(WITHOUT_X11) + @${MKDIR} ${X11BASE}/lib/browser_plugins + ${LN} -sf ${PREFIX}/lib/djvulibre/plugins/nsdejavu.so \ + ${X11BASE}/lib/browser_plugins/nsdejavu.so +.endif .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} + @${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} +.endfor .endif .include diff -urN /usr/ports/graphics/djvulibre/distinfo graphics/djvulibre/distinfo --- /usr/ports/graphics/djvulibre/distinfo Wed Oct 19 15:09:17 2005 +++ graphics/djvulibre/distinfo Wed Nov 16 01:32:43 2005 @@ -1,2 +1,3 @@ -MD5 (djvulibre-3.5.15.tar.gz) = 4a4c5a36799e73bd93afc4fa5d69b315 -SIZE (djvulibre-3.5.15.tar.gz) = 1829132 +MD5 (djvulibre-3.5.16.tar.gz) = 5591c99a50aed1613a796a5aa4978fc0 +SHA256 (djvulibre-3.5.16.tar.gz) = 3d90cdb7ad4c0481ec90796f12cfaf5240c4d73ba59e158d8ee333fec0837b58 +SIZE (djvulibre-3.5.16.tar.gz) = 1803961 diff -urN /usr/ports/graphics/djvulibre/files/patch-cflags graphics/djvulibre/files/patch-cflags --- /usr/ports/graphics/djvulibre/files/patch-cflags Wed Oct 19 22:02:42 2005 +++ graphics/djvulibre/files/patch-cflags Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- xmltools/Makefile.in Tue Aug 24 13:58:56 2004 -+++ xmltools/Makefile.in Wed Oct 19 08:45:42 2005 -@@ -51,6 +51,6 @@ - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS} - LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@ --CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS} --CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS} -+CFLAGS += ${FLAGS} @CPPFLAGS@ -+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS} - - PROGRAMS = djvutoxml djvuxmlparser -+++ libdjvu/Makefile.in Wed Oct 19 08:45:42 2005 -@@ -51,5 +51,5 @@ - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS} - LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@ --CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS} --CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS} -+CFLAGS += ${FLAGS} @CPPFLAGS@ -+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS} - -+++ tools/Makefile.in Wed Oct 19 08:45:42 2005 -@@ -51,5 +51,5 @@ - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS} - LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@ --CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS} --CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS} -+CFLAGS += ${FLAGS} @CPPFLAGS@ -+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS} - diff -urN /usr/ports/graphics/djvulibre/files/patch-gsfiles_Makefile.in graphics/djvulibre/files/patch-gsfiles_Makefile.in --- /usr/ports/graphics/djvulibre/files/patch-gsfiles_Makefile.in Wed Oct 19 22:02:42 2005 +++ graphics/djvulibre/files/patch-gsfiles_Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,9 +0,0 @@ ---- gsfiles/Makefile.in Tue Aug 24 13:58:55 2004 -+++ gsfiles/Makefile.in Tue Oct 18 18:36:57 2005 -@@ -43,5 +43,5 @@ - install-bin: djvudigital FORCE - ${INSTALL} -d ${DESTDIR}${bindir} -- ${INSTALL_PROGRAM} -m 0755 ${srcdir}/djvudigital ${DESTDIR}${bindir} -+ ${BSD_INSTALL_SCRIPT} -m 0755 ${srcdir}/djvudigital ${DESTDIR}${bindir} - - install-man: FORCE diff -urN /usr/ports/graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in --- /usr/ports/graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in Sat Apr 30 22:40:03 2005 +++ graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ -diff -ur gui/nsdejavu/Makefile.in.ori gui/nsdejavu/Makefile.in ---- gui/nsdejavu/Makefile.in.ori Fri Aug 1 16:55:31 2003 -+++ gui/nsdejavu/Makefile.in Fri Aug 1 16:56:55 2003 -@@ -25,7 +25,7 @@ - datadir = @datadir@ - libdir = @libdir@ - mandir = @mandir@ --plugindir = ${libdir}/netscape/plugins -+plugindir = ${libdir}/browser_plugins - - CC = @CC@ - CXX = @CXX@ diff -urN /usr/ports/graphics/djvulibre/pkg-descr graphics/djvulibre/pkg-descr --- /usr/ports/graphics/djvulibre/pkg-descr Mon Nov 18 19:54:20 2002 +++ graphics/djvulibre/pkg-descr Fri Nov 18 23:37:10 2005 @@ -1,24 +1,13 @@ -DjVu is a web-centric format and software platform for distributing -documents and images.DjVu was originally developped at AT&T -Labs-Research by Leon Bottou, Yann LeCun, Patrick Haffner, and many -others. In March 2000, AT&T sold DjVu to LizardTech Inc. who now -distributes Windows/Mac plug-ins, and commercial encoders (mostly on -Windows) +DjVu is a web-centric format and software platform for distributing +documents and images. DjVu was originally developped at AT&T +Labs-Research. In March 2000, AT&T sold DjVu to LizardTech Inc. who +now distributes Windows/Mac plug-ins, and commercial encoders (mostly +on Windows) -The LizardTech released the reference implementation of DjVu under the -GNU GPL in October 2000. DjVuLibre (which means free DjVu), is an -enhanced version of that code maintained by the original inventors of -DjVu. It is compatible with version 3.5 of the LizardTech DjVu software -suite. DjVulibre-3.5 contains: - - a standalone DjVu viewer based on the Qt library. - - A browser plugin that works with most Unix browsers. - (such as Mozilla and Opera) - - A full-fledged wavelet-based compressor for pictures. - - A simple compressor for bitonal (black and white) scanned pages. - - A compressor for palettized images (a la GIF/PNG). - - A set of utilities to manipulate and assemble DjVu images and - documents. - - A set of decoders to convert DjVu to a number of other formats. - - An up-to-date version of the C++ DjVu Reference Library. +The LizardTech released the reference implementation of DjVu under +the GNU GPL in October 2000. DjVuLibre (which means free DjVu), is +an enhanced version of that code maintained by the original inventors +of DjVu. It is compatible with version 3.5 of the LizardTech DjVu +software suite. -WWW: http://djvu.sourceforge.net/ +WWW: http://djvulibre.djvuzone.org/ diff -urN /usr/ports/graphics/djvulibre/pkg-plist graphics/djvulibre/pkg-plist --- /usr/ports/graphics/djvulibre/pkg-plist Wed Oct 19 15:09:17 2005 +++ graphics/djvulibre/pkg-plist Fri Nov 18 23:07:55 2005 @@ -1,3 +1,4 @@ +bin/any2djvu bin/bzz bin/c44 bin/cjb2 @@ -18,9 +19,11 @@ bin/djvutxt bin/djvuxmlparser include/libdjvu/ddjvuapi.h -%%X11%%lib/browser_plugins/nsdejavu.so +include/libdjvu/miniexp.h +%%X11%%lib/djvulibre/plugins/nsdejavu.so +lib/libdjvulibre.a lib/libdjvulibre.so -lib/libdjvulibre.so.%%MAJOR_VERSION%% +lib/libdjvulibre.so.16 share/djvu/languages.xml %%X11%%share/djvu/osi/de/djview.qm share/djvu/osi/de/libdjvu++.xml @@ -44,6 +47,9 @@ share/djvu/pubtext/DjVuMessages.dtd share/djvu/pubtext/DjVuOCR.dtd share/djvu/pubtext/DjVuXML-s.dtd +%%X11%%@exec mkdir -p %%X11BASE%%/lib/browser_plugins +%%X11%%@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%X11BASE%%/lib/browser_plugins/nsdejavu.so +%%X11%%@unexec rm -f %%X11BASE%%/lib/browser_plugins/nsdejavu.so @dirrm share/djvu/pubtext @dirrm share/djvu/osi/zh @dirrm share/djvu/osi/ja @@ -52,9 +58,11 @@ @dirrm share/djvu/osi/de @dirrm share/djvu/osi @dirrm share/djvu +@dirrm lib/djvulibre/plugins +@dirrm lib/djvulibre @dirrm include/libdjvu @unexec rmdir %D/man/fr/man1 2>/dev/null || true @unexec rmdir %D/man/fr 2>/dev/null || true @unexec rmdir %D/man/de/man1 2>/dev/null || true @unexec rmdir %D/man/de 2>/dev/null || true -@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true +@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true