diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-10-05 21:30:26 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-10-05 21:30:26 +0000 |
commit | 49d24ca54851e5a172df15248250aae70b8899bb (patch) | |
tree | 2c20cb3ffd0ec9339fb3a31ff2b3cdcf5431ef71 /graphics/djvulibre | |
parent | ea8128e0d2bc102d0e1e18ace66915397db2608c (diff) | |
download | ports-49d24ca54851e5a172df15248250aae70b8899bb.tar.gz ports-49d24ca54851e5a172df15248250aae70b8899bb.zip |
Notes
Diffstat (limited to 'graphics/djvulibre')
-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 |
5 files changed, 6 insertions, 74 deletions
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 |