diff options
| author | mi <mi@FreeBSD.org> | 2005-10-18 23:42:28 +0000 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2005-10-18 23:42:28 +0000 |
| commit | 8dbee4b0a4a0270f6295a2d5d00459dee4e83114 (patch) | |
| tree | 4fd03dcbc21ffbf0dc8dbe3bf1adffac72e3c6b2 | |
| parent | ddff77fdec739bef5d31332f6fb6e44047d73b6c (diff) | |
| download | FreeBSD-ports-8dbee4b0a4a0270f6295a2d5d00459dee4e83114.zip FreeBSD-ports-8dbee4b0a4a0270f6295a2d5d00459dee4e83114.tar.gz | |
Upgrade from 3.5.14 to 3.5.15. Always explicitly depend on jpeg and tiff --
we use them with or without X11. Always remove the uber-optimization -- -O3
is dangerous, -m*=i386 is silly.
| -rw-r--r-- | graphics/djvulibre/Makefile | 25 | ||||
| -rw-r--r-- | graphics/djvulibre/distinfo | 4 | ||||
| -rw-r--r-- | graphics/djvulibre/pkg-plist | 2 |
3 files changed, 13 insertions, 18 deletions
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index deb3ac5..13fd2e9 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -6,8 +6,7 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.14 -PORTREVISION= 1 +PORTVERSION= 3.5.15 CATEGORIES= graphics www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= djvu @@ -15,13 +14,14 @@ MASTER_SITE_SUBDIR= djvu 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 -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg .else PKGNAMESUFFIX= -nox11 -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff .endif USE_ICONV= yes @@ -42,14 +42,9 @@ CONFIGURE_ENV+= CXX=${CXX} \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ QTLIBS="-L${X11BASE}/lib -lqt-mt" .else -CONFIGURE_ARGS+=--disable-djview +CONFIGURE_ARGS+=--disable-djview --without-x .endif -.if !defined(WITH_OPTIMIZED_CFLAGS) -pre-everything:: - @${ECHO_MSG} "You can enable additional compilation optimizations" - @${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS" -.endif .if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local" pre-configure: @@ -63,14 +58,13 @@ patch-autotools: post-patch: @${RM} ${WRKSRC}/tools/any2djvu.* -.if !defined(WITH_OPTIMIZED_CFLAGS) post-configure: - ${PERL5} -pi -e 's,-O3,,;' -e 's,-mcpu=i386,,; ' \ - -e 's,^(OPTS =.*),\1 ${CFLAGS},' \ + ${PERL5} -pi -e 's,-O3,,;' -e 's,-m.+=i386,,;' \ + -e 's|^(OPTS =.*)|\1 ${CFLAGS}|' \ ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile -.endif -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 @@ -78,6 +72,7 @@ MAN1= bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 djvmcvt.1 djvu.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 PLIST_SUB+= X11='' diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo index 4094e6b..dd299c5 100644 --- a/graphics/djvulibre/distinfo +++ b/graphics/djvulibre/distinfo @@ -1,2 +1,2 @@ -MD5 (djvulibre-3.5.14.tar.gz) = a9b60d0c47d6b98e321100d329c7f3b3 -SIZE (djvulibre-3.5.14.tar.gz) = 1742428 +MD5 (djvulibre-3.5.15.tar.gz) = 4a4c5a36799e73bd93afc4fa5d69b315 +SIZE (djvulibre-3.5.15.tar.gz) = 1829132 diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index a63d398..0eafd32 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -20,7 +20,7 @@ bin/djvuxmlparser include/libdjvu/ddjvuapi.h %%X11%%lib/browser_plugins/nsdejavu.so lib/libdjvulibre.so -lib/libdjvulibre.so.14 +lib/libdjvulibre.so.%%MAJOR_VERSION%% share/djvu/languages.xml %%X11%%share/djvu/osi/de/djview.qm share/djvu/osi/de/libdjvu++.xml |
