Date: Sun, 5 Oct 2014 21:30:26 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370129 - in head: converters/pdf2djvu graphics/ImageMagick graphics/apvlv graphics/atril graphics/djview4 graphics/djvulibre graphics/djvulibre/files graphics/evince graphics/okular gr... Message-ID: <201410052130.s95LUQoa025506@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Oct 5 21:30:26 2014 New Revision: 370129 URL: https://svnweb.freebsd.org/changeset/ports/370129 QAT: https://qat.redports.org/buildarchive/r370129/ Log: graphics/djvulibre: - Add USES=libtool and bump dependent ports - Remove threading related patches Deleted: head/graphics/djvulibre/files/patch-config_ltmain.sh head/graphics/djvulibre/files/patch-xmltools_Makefile.in Modified: head/converters/pdf2djvu/Makefile head/graphics/ImageMagick/Makefile head/graphics/apvlv/Makefile head/graphics/atril/Makefile head/graphics/djview4/Makefile head/graphics/djvulibre/Makefile head/graphics/djvulibre/files/patch-tools_Makefile.in head/graphics/djvulibre/pkg-plist head/graphics/evince/Makefile head/graphics/okular/Makefile head/graphics/zathura-djvu/Makefile head/print/qpdfview/Makefile head/x11/leechcraft/Makefile Modified: head/converters/pdf2djvu/Makefile ============================================================================== --- head/converters/pdf2djvu/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/converters/pdf2djvu/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.7.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/ImageMagick/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -2,6 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.8.9-8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Modified: head/graphics/apvlv/Makefile ============================================================================== --- head/graphics/apvlv/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/apvlv/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= apvlv PORTVERSION= 0.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source Modified: head/graphics/atril/Makefile ============================================================================== --- head/graphics/atril/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/atril/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,6 +3,7 @@ PORTNAME= atril PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= graphics print mate MASTER_SITES= MATE DIST_SUBDIR= mate Modified: head/graphics/djview4/Makefile ============================================================================== --- head/graphics/djview4/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/djview4/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= djview PORTVERSION= 4.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} Modified: head/graphics/djvulibre/Makefile ============================================================================== --- head/graphics/djvulibre/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/djvulibre/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.25.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics www MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION:R} @@ -15,16 +15,13 @@ LICENSE= GPLv2 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= pathfix iconv GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ TIFF_CFLAGS="-I${LOCALBASE}/include" \ - TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --enable-threads=pthread --enable-shared + TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} +USES= iconv libtool pathfix USE_LDCONFIG= yes CONFLICTS= djvulibre-nox11-3* WRKSRC= ${WRKDIR}/${DISTNAME:R} Modified: head/graphics/djvulibre/files/patch-tools_Makefile.in ============================================================================== --- head/graphics/djvulibre/files/patch-tools_Makefile.in Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/djvulibre/files/patch-tools_Makefile.in Sun Oct 5 21:30:26 2014 (r370129) @@ -1,14 +1,5 @@ --- tools/Makefile.in.orig 2009-07-07 17:04:26.000000000 +0200 +++ tools/Makefile.in 2009-07-07 17:11:00.000000000 +0200 -@@ -53,7 +53,7 @@ - - INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir} - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS} --LIBS= @LDFLAGS@ @LIBS@ -+LIBS= @LDFLAGS@ @LIBS@ @THREAD_LIBS@ - MORELIBS= @LDFLAGS@ ${TIFF_LIBS} @LIBS@ - CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ - CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ @@ -83,7 +83,7 @@ install-scripts: FORCE ${INSTALL} -d ${DESTDIR}${bindir} @@ -18,21 +9,3 @@ || exit ; done install-man: FORCE -@@ -127,7 +127,7 @@ - - cjb2: cjb2.o ${JB2OBJS} - ${LIBTOOL} --mode=link \ -- ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} -+ ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS} - - cpaldjvu: cpaldjvu.o ${JB2OBJS} - ${LIBTOOL} --mode=link \ -@@ -139,7 +139,7 @@ - - ddjvu: ddjvu.o tiff2pdf.o - ${LIBTOOL} --mode=link \ -- ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} -+ ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS} - - djvm: djvm.o - ${LIBTOOL} --mode=link \ Modified: head/graphics/djvulibre/pkg-plist ============================================================================== --- head/graphics/djvulibre/pkg-plist Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/djvulibre/pkg-plist Sun Oct 5 21:30:26 2014 (r370129) @@ -20,7 +20,8 @@ bin/djvuxmlparser include/libdjvu/ddjvuapi.h include/libdjvu/miniexp.h lib/libdjvulibre.so -lib/libdjvulibre.so.25 +lib/libdjvulibre.so.21 +lib/libdjvulibre.so.21.4.0 libdata/pkgconfig/ddjvuapi.pc %%ANY2DJVU%%man/man1/any2djvu.1.gz man/man1/bzz.1.gz @@ -70,14 +71,3 @@ share/djvu/osi/zh/messages.xml share/djvu/pubtext/DjVuMessages.dtd share/djvu/pubtext/DjVuOCR.dtd share/djvu/pubtext/DjVuXML-s.dtd -@dirrm share/djvu/pubtext -@dirrm share/djvu/osi/zh -@dirrm share/djvu/osi/ja -@dirrm share/djvu/osi/fr -@dirrm share/djvu/osi/en -@dirrm share/djvu/osi/desktop -@dirrm share/djvu/osi/de -@dirrm share/djvu/osi/cs -@dirrm share/djvu/osi -@dirrmtry share/djvu -@dirrm include/libdjvu Modified: head/graphics/evince/Makefile ============================================================================== --- head/graphics/evince/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/evince/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -4,7 +4,7 @@ PORTNAME= evince PORTVERSION= 2.32.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: head/graphics/okular/Makefile ============================================================================== --- head/graphics/okular/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/okular/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -2,7 +2,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Modified: head/graphics/zathura-djvu/Makefile ============================================================================== --- head/graphics/zathura-djvu/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/graphics/zathura-djvu/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,6 +3,7 @@ PORTNAME= zathura-djvu PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ Modified: head/print/qpdfview/Makefile ============================================================================== --- head/print/qpdfview/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/print/qpdfview/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= qpdfview PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/140746246/ Modified: head/x11/leechcraft/Makefile ============================================================================== --- head/x11/leechcraft/Makefile Sun Oct 5 21:25:20 2014 (r370128) +++ head/x11/leechcraft/Makefile Sun Oct 5 21:30:26 2014 (r370129) @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ DISTNAME= ${PORTNAME}-${PORTVERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410052130.s95LUQoa025506>