mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

- Fix pthread confusion in build so that djvulibre runs reliably on both -STABLE and -CURRENT.

Browse Source 
- Take care of some pkg-plist issues.
- Enable linking to tiff in the WITHOUT_X11 case for complete capability.
- This version adds some XML utilities.

PR:		ports/68758
Submitted by:	maintainer
This commit is contained in:
Volker Stolz 2004-07-08 16:58:37 +00:00
parent 982e464ebf
commit 3277746abd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=113226
5 changed files with 65 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/djvulibre/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= djvulibre
PORTVERSION= 3.5.12
PORTVERSION= 3.5.13
CATEGORIES= graphics www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= djvu
@ -14,26 +14,29 @@ MASTER_SITE_SUBDIR= djvu
MAINTAINER= coop9211@uidaho.edu
COMMENT= DjVu viewers, encoders, browser plugin, and utilities
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
.ifndef WITHOUT_X11
USE_X_PREFIX= yes
USE_QT_VER= 3
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
.else
PKGNAMESUFFIX= -nox11
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
.endif
USE_ICONV= yes
USE_PERL5= yes
USE_PERL5_BUILD=yes
HAS_CONFIGURE= yes
CONFIGURE_ENV= JPEG_CFLAGS=-I"${LOCALBASE}/include" \
JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg"
CONFIGURE_ARGS= --enable-threads=posix --enable-shared --prefix="${PREFIX}"
INSTALLS_SHLIB= yes
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}"
.ifndef WITHOUT_X11
CONFIGURE_ENV+= CXX=${CXX} \
PTHREAD_CFLAGS=-pthread \
PTHREAD_LIBS=-pthread \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
QTLIBS="-L${X11BASE}/lib -lqt-mt"
.else
CONFIGURE_ARGS+=--disable-djview

4
graphics/djvulibre/distinfo
View File

@ -1,2 +1,2 @@
MD5 (djvulibre-3.5.12.tar.gz) = 4adeb92beb8295aa330b9c6b042ba02d
SIZE (djvulibre-3.5.12.tar.gz) = 1298191
MD5 (djvulibre-3.5.13.tar.gz) = 5df02ba314ce32b95f4ee18e4b863441
SIZE (djvulibre-3.5.13.tar.gz) = 1452616

69
graphics/djvulibre/files/patch-aa
View File

@ -1,69 +0,0 @@
diff -ur gui/djview/Makefile.in.ori gui/djview/Makefile.in
--- gui/djview/Makefile.in.ori Fri Jan 24 14:02:11 2003
+++ gui/djview/Makefile.in Fri Aug 1 14:59:13 2003
@@ -50,7 +50,10 @@
X_CFLAGS = @X_CFLAGS@
LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
-LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
+.endif
@SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO}
@SHARED_NO@LIBDJVU = ${LIBDJVU_A}
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@
@@ -40,7 +40,7 @@
OPTS = @OPTS@
NSDEJAVU = @NSDEJAVU@
NSDEJAVU_FLAGS = @NSDEJAVU_FLAGS@
-NSDEJAVU_LIBS = @NSDEJAVU_LIBS@
+NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -lXt
NSDEJAVU_LINK = @NSDEJAVU_LINK@
INCS = \
diff -ur libdjvu/Makefile.in.ori libdjvu/Makefile.in
--- libdjvu/Makefile.in.ori Mon Jan 6 14:10:43 2003
+++ libdjvu/Makefile.in Fri Aug 1 14:59:12 2003
@@ -44,7 +44,11 @@
THREAD_CFLAGS = @THREAD_CFLAGS@
LIBDJVU_A = libdjvulibre.a
-LIBDJVU_SO = libdjvulibre-${PACKAGE_VERSION}.so
+LIBDJVU_SO:= libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
+.endif
+
@SHARED_YES@CXXPICFLAGS = -fPIC -DPIC
@SHARED_NO@CXXPICFLAGS =
diff -ur tools/Makefile.in.ori tools/Makefile.in
--- tools/Makefile.in.ori Mon Jan 6 14:10:47 2003
+++ tools/Makefile.in Fri Aug 1 14:59:13 2003
@@ -44,7 +44,11 @@
THREAD_CFLAGS = @THREAD_CFLAGS@
LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
-LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
+.endif
+
@SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO}
@SHARED_NO@LIBDJVU = ${LIBDJVU_A}

21
graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in Normal file
View File

@ -0,0 +1,21 @@
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@
@@ -40,7 +40,7 @@
OPTS = @OPTS@
NSDEJAVU = @NSDEJAVU@
NSDEJAVU_FLAGS = @NSDEJAVU_FLAGS@
-NSDEJAVU_LIBS = @NSDEJAVU_LIBS@
+NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -lXt
NSDEJAVU_LINK = @NSDEJAVU_LINK@
INCS = \

45
graphics/djvulibre/pkg-plist
View File

@ -7,36 +7,51 @@ bin/ddjvu
%%X11%%bin/djview
bin/djvm
bin/djvmcvt
bin/djvudigital
bin/djvudump
bin/djvuextract
bin/djvumake
bin/djvups
bin/djvused
bin/djvuserve
bin/djvutoxml
bin/djvutxt
bin/djvuxmlparser
%%X11%%lib/browser_plugins/nsdejavu.so
lib/libdjvulibre3.so.5
lib/libdjvulibre-3.5.13.so
share/djvu/languages.xml
share/djvu/osi/Chinese_PRC/libdjvu++.xml
share/djvu/osi/Chinese_PRC/messages.xml
@dirrm share/djvu/osi/Chinese_PRC
share/djvu/osi/de_DE/libdjvu++.xml
share/djvu/osi/de_DE/messages.xml
@dirrm share/djvu/osi/de_DE
%%X11%%share/djvu/osi/de/djview.qm
share/djvu/osi/de/libdjvu++.xml
share/djvu/osi/de/messages.xml
%%X11%%share/djvu/osi/de/qt.qm
share/djvu/osi/en/djvutools-reference.xml
share/djvu/osi/en/libdjvu++.xml
share/djvu/osi/en/messages.xml
share/djvu/osi/en/unixgui-shared.xml
share/djvu/osi/en/unixgui-viewer.xml
@dirrm share/djvu/osi/en
share/djvu/osi/fr_FR/libdjvu++.xml
share/djvu/osi/fr_FR/messages.xml
@dirrm share/djvu/fr_FR
share/djvu/osi/ja_JP/libdjvu++.xml
share/djvu/osi/ja_JP/messages.xml
@dirrm share/djvu/ja_JP
@dirrm share/djvu
%%X11%%share/djvu/osi/fr/djview.qm
share/djvu/osi/fr/libdjvu++.xml
share/djvu/osi/fr/messages.xml
%%X11%%share/djvu/osi/fr/qt.qm
%%X11%%share/djvu/osi/ja/djview.qm
share/djvu/osi/ja/libdjvu++.xml
share/djvu/osi/ja/messages.xml
%%X11%%share/djvu/osi/ja/qt.qm
share/djvu/osi/zh/libdjvu++.xml
share/djvu/osi/zh/messages.xml
share/djvu/pubtext/DjVuMessages.dtd
share/djvu/pubtext/DjVuOCR.dtd
share/djvu/pubtext/DjVuXML-s.dtd
%%PORTDOCS%%%%DOCSDIR%%/djvu2spec.djvu
%%PORTDOCS%%%%DOCSDIR%%/djvu3changes.txt
%%PORTDOCS%%%%DOCSDIR%%/lizard2002.djvu
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@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/de
@dirrm share/djvu/osi
@dirrm share/djvu