diff options
-rw-r--r-- | converters/pdf2djvu/Makefile | 2 | ||||
-rw-r--r-- | graphics/ImageMagick/Makefile | 1 | ||||
-rw-r--r-- | graphics/apvlv/Makefile | 2 | ||||
-rw-r--r-- | graphics/atril/Makefile | 1 | ||||
-rw-r--r-- | graphics/djview4/Makefile | 2 | ||||
-rw-r--r-- | graphics/djvulibre/Makefile | 11 | ||||
-rw-r--r-- | graphics/djvulibre/files/patch-config_ltmain.sh | 17 | ||||
-rw-r--r-- | graphics/djvulibre/files/patch-tools_Makefile.in | 27 | ||||
-rw-r--r-- | graphics/djvulibre/files/patch-xmltools_Makefile.in | 11 | ||||
-rw-r--r-- | graphics/djvulibre/pkg-plist | 14 | ||||
-rw-r--r-- | graphics/evince/Makefile | 2 | ||||
-rw-r--r-- | graphics/okular/Makefile | 2 | ||||
-rw-r--r-- | graphics/zathura-djvu/Makefile | 1 | ||||
-rw-r--r-- | print/qpdfview/Makefile | 2 | ||||
-rw-r--r-- | x11/leechcraft/Makefile | 2 |
15 files changed, 16 insertions, 81 deletions
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 14ed2a1db1b3..8715f5971a03 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -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} diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index e94fdaccbce7..dec6b3ba9295 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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/ \ diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile index 37c39fb94209..7a77c9998a3f 100644 --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -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 diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index dbd3f4ae31da..8e98b6ead0cf 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -3,6 +3,7 @@ PORTNAME= atril PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= graphics print mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index c8eace9f8c38..719d16c7177c 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -3,7 +3,7 @@ PORTNAME= djview PORTVERSION= 4.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 176dba3a5d1e..00e4b32dcd23 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -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} diff --git a/graphics/djvulibre/files/patch-config_ltmain.sh b/graphics/djvulibre/files/patch-config_ltmain.sh deleted file mode 100644 index db247645038a..000000000000 --- a/graphics/djvulibre/files/patch-config_ltmain.sh +++ /dev/null @@ -1,17 +0,0 @@ ---- config/ltmain.sh.orig 2010-11-19 01:46:29.000000000 -0800 -+++ config/ltmain.sh 2010-11-19 01:46:38.000000000 -0800 -@@ -2076,14 +2076,6 @@ - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - -- # Install the pseudo-library for information purposes. -- func_basename "$file" -- name="$func_basename_result" -- instname="$dir/$name"i -- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' -- -- # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) diff --git a/graphics/djvulibre/files/patch-tools_Makefile.in b/graphics/djvulibre/files/patch-tools_Makefile.in index 74a93ab39199..b3c494dd8eb8 100644 --- a/graphics/djvulibre/files/patch-tools_Makefile.in +++ b/graphics/djvulibre/files/patch-tools_Makefile.in @@ -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 \ diff --git a/graphics/djvulibre/files/patch-xmltools_Makefile.in b/graphics/djvulibre/files/patch-xmltools_Makefile.in deleted file mode 100644 index 1b01a25406c8..000000000000 --- a/graphics/djvulibre/files/patch-xmltools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./xmltools/Makefile.in.orig 2009-07-03 16:10:50.000000000 +0400 -+++ ./xmltools/Makefile.in 2009-07-03 16:11:10.000000000 +0400 -@@ -51,7 +51,7 @@ - - INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir} - FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS} --LIBS= @LDFLAGS@ @LIBS@ -+LIBS= @LDFLAGS@ @LIBS@ ${THREAD_LIBS} - CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ - CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ - diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index 981d1ac7edc5..6ce98212b560 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -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 diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index b50c1f73d064..abb244a38eca 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -4,7 +4,7 @@ PORTNAME= evince PORTVERSION= 2.32.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index 551b3c5cba1c..678bbe10ef0a 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -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} diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile index 468abd586f1e..8eff88714c02 100644 --- a/graphics/zathura-djvu/Makefile +++ b/graphics/zathura-djvu/Makefile @@ -3,6 +3,7 @@ PORTNAME= zathura-djvu PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index 3453a57ab1fb..4136d708c93f 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpdfview PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/140746246/ diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index cdce70ac1d4a..9031287d6341 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -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} |