View | Details | Raw Unified | Return to bug 198087 | Differences between
and this patch

Collapse All | Expand All

(-)djvulibre/Makefile (-21 / +19 lines)
Lines 2-11 Link Here
2
# $FreeBSD: head/graphics/djvulibre/Makefile 386200 2015-05-13 04:55:38Z amdmi3 $
2
# $FreeBSD: head/graphics/djvulibre/Makefile 386200 2015-05-13 04:55:38Z amdmi3 $
3
3
4
PORTNAME=	djvulibre
4
PORTNAME=	djvulibre
5
PORTVERSION=	3.5.25.3
5
PORTVERSION=	3.5.27
6
PORTREVISION=	3
7
CATEGORIES=	graphics www
6
CATEGORIES=	graphics www
8
MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION:R}
7
MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
9
8
10
MAINTAINER=	bf@FreeBSD.org
9
MAINTAINER=	bf@FreeBSD.org
11
COMMENT=	DjVu base libraries and utilities
10
COMMENT=	DjVu base libraries and utilities
Lines 13-34 Link Here
13
LICENSE=	GPLv2 # or later
12
LICENSE=	GPLv2 # or later
14
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
15
14
15
BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2
16
LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
16
LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
17
		libtiff.so:${PORTSDIR}/graphics/tiff
17
		libtiff.so:${PORTSDIR}/graphics/tiff
18
18
19
INSTALL_TARGET=	install-strip
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
20
CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
22
CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
21
		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
23
		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
22
		TIFF_CFLAGS="-I${LOCALBASE}/include" \
24
		TIFF_CFLAGS="-I${LOCALBASE}/include" \
23
		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
25
		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
24
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
26
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
25
USES=		cpe iconv libtool pathfix
27
USES=		cpe gmake iconv libtool shared-mime-info
26
CPE_VENDOR=	djvulibre_project
28
CPE_VENDOR=	djvulibre_project
27
USE_LDCONFIG=	yes
29
USE_LDCONFIG=	yes
28
CONFLICTS=	djvulibre-nox11-3*
30
CONFLICTS=	djvulibre-nox11-3*
29
WRKSRC=		${WRKDIR}/${DISTNAME:R}
30
31
31
PORTDOCS=	djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu
32
PORTDOCS=	*.djvu *.pdf *.txt
32
33
33
OPTIONS_DEFINE=		DOCS ANY2DJVU
34
OPTIONS_DEFINE=		DOCS ANY2DJVU
34
OPTIONS_SUB=		yes
35
OPTIONS_SUB=		yes
Lines 38-62 Link Here
38
39
39
.include <bsd.port.options.mk>
40
.include <bsd.port.options.mk>
40
41
41
post-patch:
42
post-patch: .SILENT
42
	@${REINPLACE_CMD} -e \
43
# Remove custom optimization compiler flags
43
		'/-[Og]\*)/d ; \
44
	${REINPLACE_CMD} -e '/-[Og]\*)/d ; \
44
		s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \
45
		/^ opt=/s|-O[[:digit:]]*||g' \
45
		s|$$OPTS $$opt|$$OPTS|g' \
46
		${WRKSRC}/configure
46
		${WRKSRC}/configure
47
	@${REINPLACE_CMD} -e \
47
# Convert bash to sh script, which uses fetch instead of wget
48
		's|$${FLAGS}|| ; \
48
	${REINPLACE_CMD} -e '/^#!/s|bash -f|sh| ; \
49
		s|@CPPFLAGS@|$${FLAGS} &|' \
49
		s|^function || ; s| == | = |g ; \
50
		${WRKSRC}/tools/jb2cmp/Makefile.in
50
		s|wget $$wgetopts -O|${FETCH_BINARY} $$wgetopts -o|' \
51
	@${REINPLACE_CMD} -e \
51
		${WRKSRC}/tools/any2djvu
52
		's|_PROGRAM} -m 0755|_SCRIPT}|' \
53
		${WRKSRC}/tools/Makefile.in
54
.if empty(PORT_OPTIONS:MANY2DJVU)
52
.if empty(PORT_OPTIONS:MANY2DJVU)
55
	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
53
	${REINPLACE_CMD} -e 's/any2djvu // ; s/any2djvu\.1 //' \
54
		${WRKSRC}/tools/Makefile.in
56
.endif
55
.endif
57
56
58
post-install:
57
post-install:
59
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
58
	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
60
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
61
59
62
.include <bsd.port.mk>
60
.include <bsd.port.mk>
(-)djvulibre/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (djvulibre-3.5.25.3.tar.gz) = 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0
1
SHA256 (djvulibre-3.5.27.tar.gz) = e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f
2
SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949
2
SIZE (djvulibre-3.5.27.tar.gz) = 3648522
(-)djvulibre/files/patch-desktopfiles_Makefile.in (-37 lines)
Lines 1-37 Link Here
1
--- desktopfiles/Makefile.in.orig	2012-06-13 09:31:40.000000000 -0400
2
+++ desktopfiles/Makefile.in	2012-06-13 09:34:37.000000000 -0400
3
@@ -30,6 +30,7 @@
4
 
5
 INSTALL = @INSTALL@
6
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
7
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
8
 INSTALL_DATA = @INSTALL_DATA@
9
 CONVERT = @CONVERT@
10
 INKSCAPE = @INKSCAPE@
11
@@ -53,15 +54,10 @@
12
 icons: ${PNGICONS} hi-djvu.svgz 
13
 
14
 ${PNGICONS}: djvu.svg
15
-	s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
16
-	  ${RSVG} -w $${s} -h $${s} -o $@ $< \
17
-          || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
18
-	  || ${INKSCAPE} --without-gui --export-width=$${s} \
19
-                         --export-height=$${s} --export-png=$@ $< \
20
-	  || cp ${srcdir}/prebuilt-$@ $@
21
+	if test -f ${srcdir}/prebuilt-$@ ; then cp ${srcdir}/prebuilt-$@ $@ ; fi
22
 
23
 hi-djvu.svgz: djvu.svg
24
-	cat $< | gzip >$@
25
+	cat ${.ALLSRC} | gzip >$@
26
 
27
 register-djvu-mime: register-djvu-mime.in
28
 	sed < ${srcdir}/register-djvu-mime.in > register-djvu-mime \
29
@@ -80,7 +76,7 @@
30
 
31
 install-djvu-files: FORCE
32
 	${INSTALL} -d ${DESTDIR}${datadir_djvu}
33
-	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
34
+	${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
35
 	${INSTALL_DATA} *djvu.png ${DESTDIR}${datadir_djvu}
36
 	${INSTALL_DATA} *djvu.svgz ${DESTDIR}${datadir_djvu}
37
 	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
(-)djvulibre/files/patch-libdjvu__miniexp.cpp (-11 lines)
Lines 1-11 Link Here
1
--- libdjvu/miniexp.cpp.orig	2012-05-07 22:56:53.000000000 -0400
2
+++ libdjvu/miniexp.cpp	2012-06-12 07:23:54.000000000 -0400
3
@@ -1008,7 +1008,7 @@
4
   if (io == &miniexp_io && !CompatCounter::count)
5
     return (*minilisp_getc)(); /* compatibility hack */
6
   FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
7
-  return ::getc(f);
8
+  return getc(f);
9
 }
10
 
11
 static int 
(-)djvulibre/files/patch-tools_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- tools/Makefile.in.orig	2009-07-07 17:04:26.000000000 +0200
2
+++ tools/Makefile.in	2009-07-07 17:11:00.000000000 +0200
3
@@ -83,7 +83,7 @@
4
 install-scripts: FORCE
5
 	${INSTALL} -d ${DESTDIR}${bindir}
6
 	for n in ${SCRIPTS} ; do \
7
-	  ${INSTALL_PROGRAM} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
8
+	  ${INSTALL} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
9
 	  || exit ; done
10
 
11
 install-man: FORCE
(-)djvulibre/files/patch-tools_any2djvu (-90 lines)
Lines 1-90 Link Here
1
--- tools/any2djvu.orig	2011-03-31 00:54:11.000000000 -0700
2
+++ tools/any2djvu	2011-03-31 00:56:54.000000000 -0700
3
@@ -1,6 +1,6 @@
4
-#! /bin/bash -f
5
+#!/bin/sh
6
 
7
-function copyright()
8
+copyright()
9
 {
10
     echo "Copyright (C) 2002 David Kreil <D.Kreil@IEEE.Org>"
11
     echo "Modified by Barak A. Pearlmutter <bap@debian.org>"
12
@@ -8,7 +8,7 @@
13
     echo "Released under the GNU GPL v2, 21-Oct-2002."
14
 }
15
 
16
-function warranty()
17
+warranty()
18
 {
19
     echo "This program is distributed in the hope that it will be useful,"
20
     echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
21
@@ -16,7 +16,7 @@
22
     echo "GNU General Public License for more details."
23
 }
24
 
25
-function disclaimer()
26
+disclaimer()
27
 {
28
     echo "By using this tool you accept the following disclaimer:"
29
     echo "  Because the any2djvu service is free of charge, there is no"
30
@@ -34,7 +34,7 @@
31
 ocr=1
32
 docformat=2
33
 
34
-function warn()
35
+warn()
36
 {
37
     echo "Notes:"
38
     echo " - Internet connection is required."
39
@@ -47,7 +47,7 @@
40
     echo " - This software comes with NO WARRANTY."
41
 }
42
 
43
-function format_help()
44
+format_help()
45
 {
46
     echo "Codes for the formats of the input documents to use with -f"
47
     echo "  1 - DjVu Document (for verification or OCR)"
48
@@ -61,7 +61,7 @@
49
     echo "  9 - Scanned Document - Color/Mixed - >400 dpi"
50
 }
51
 
52
-function usage()
53
+usage()
54
 {
55
     echo "Convert files from .ps/.ps.gz/.pdf to .djvu"
56
     echo "Usage:	$0 [options] [url] {filename(s)}"
57
@@ -117,13 +117,13 @@
58
 fi
59
 
60
 # check OCR option
61
-if [ ! "x$ocr" == x0 ] && [ ! "x$ocr" == x1 ]; then
62
+if [ ! "x$ocr" = x0 ] && [ ! "x$ocr" = x1 ]; then
63
     echo 'error: -o OCR must be 0 or 1'
64
     exit 2
65
 fi
66
 
67
 # if help is requested or docformat is not specified right - show help
68
-if [ "x$docformat" == x'help' ]; then
69
+if [ "x$docformat" = x'help' ]; then
70
     format_help
71
     exit 0
72
 fi
73
@@ -209,7 +209,7 @@
74
             -F ocr=$ocr -F legal=1 "$rurl/$rcgi"                          \
75
             | eval tee "'$log'" $shellopts
76
     else
77
-        wget $wgetopts -O - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
78
+        /usr/bin/fetch $wgetopts -o - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
79
             | eval tee "'$log'" $shellopts
80
     fi
81
     l=`egrep 'href=djvu/.*\.djvu' "$log"`
82
@@ -219,7 +219,7 @@
83
         echo "error: something got wrong. check log file"
84
         exit 1
85
     fi
86
-    wget $wgetopts -O "$b.djvu" "$rurl/$l"
87
+    /usr/bin/fetch $wgetopts -o "$b.djvu" "$rurl/$l"
88
 
89
     [ -z "$doclean" ] || rm "$log"
90
     [ -z $silent ]  && ls -l "$b.djvu"
(-)djvulibre/pkg-plist (-12 / +14 lines)
Lines 21-27 Link Here
21
include/libdjvu/miniexp.h
21
include/libdjvu/miniexp.h
22
lib/libdjvulibre.so
22
lib/libdjvulibre.so
23
lib/libdjvulibre.so.21
23
lib/libdjvulibre.so.21
24
lib/libdjvulibre.so.21.4.0
24
lib/libdjvulibre.so.21.6.0
25
libdata/pkgconfig/ddjvuapi.pc
25
libdata/pkgconfig/ddjvuapi.pc
26
%%ANY2DJVU%%man/man1/any2djvu.1.gz
26
%%ANY2DJVU%%man/man1/any2djvu.1.gz
27
man/man1/bzz.1.gz
27
man/man1/bzz.1.gz
Lines 47-63 Link Here
47
share/djvu/osi/cs/messages.xml
47
share/djvu/osi/cs/messages.xml
48
share/djvu/osi/de/libdjvu++.xml
48
share/djvu/osi/de/libdjvu++.xml
49
share/djvu/osi/de/messages.xml
49
share/djvu/osi/de/messages.xml
50
share/djvu/osi/desktop/djvulibre-mime.xml
51
share/djvu/osi/desktop/hi-djvu.svgz
52
share/djvu/osi/desktop/hi22-djvu.png
53
share/djvu/osi/desktop/hi32-djvu.png
54
share/djvu/osi/desktop/hi48-djvu.png
55
share/djvu/osi/desktop/hi64-djvu.png
56
share/djvu/osi/desktop/prebuilt-hi22-djvu.png
57
share/djvu/osi/desktop/prebuilt-hi32-djvu.png
58
share/djvu/osi/desktop/prebuilt-hi48-djvu.png
59
share/djvu/osi/desktop/prebuilt-hi64-djvu.png
60
share/djvu/osi/desktop/register-djvu-mime
61
share/djvu/osi/en/djvutools-reference.xml
50
share/djvu/osi/en/djvutools-reference.xml
62
share/djvu/osi/en/libdjvu++.xml
51
share/djvu/osi/en/libdjvu++.xml
63
share/djvu/osi/en/messages.xml
52
share/djvu/osi/en/messages.xml
Lines 71-73 Link Here
71
share/djvu/pubtext/DjVuMessages.dtd
60
share/djvu/pubtext/DjVuMessages.dtd
72
share/djvu/pubtext/DjVuOCR.dtd
61
share/djvu/pubtext/DjVuOCR.dtd
73
share/djvu/pubtext/DjVuXML-s.dtd
62
share/djvu/pubtext/DjVuXML-s.dtd
63
share/icons/hicolor/16x16/mimetypes/djvu.png
64
share/icons/hicolor/20x20/mimetypes/djvu.png
65
share/icons/hicolor/22x22/mimetypes/djvu.png
66
share/icons/hicolor/24x24/mimetypes/djvu.png
67
share/icons/hicolor/32x32/mimetypes/djvu.png
68
share/icons/hicolor/48x48/mimetypes/djvu.png
69
share/icons/hicolor/64x64/mimetypes/djvu.png
70
share/icons/hicolor/72x72/mimetypes/djvu.png
71
share/icons/hicolor/96x96/mimetypes/djvu.png
72
share/icons/hicolor/128x128/mimetypes/djvu.png
73
share/icons/hicolor/256x256/mimetypes/djvu.png
74
share/icons/hicolor/scalable/mimetypes/djvu.svgz
75
share/mime/packages/djvulibre-mime.xml

Return to bug 198087