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

Collapse All | Expand All

(-)djview4/Makefile (-19 / +33 lines)
Lines 2-42 Link Here
2
# $FreeBSD: head/graphics/djview4/Makefile 370129 2014-10-05 21:30:26Z tijl $
2
# $FreeBSD: head/graphics/djview4/Makefile 370129 2014-10-05 21:30:26Z tijl $
3
3
4
PORTNAME=	djview
4
PORTNAME=	djview
5
PORTVERSION=	4.9
5
PORTVERSION=	4.10
6
PORTREVISION=	3
7
CATEGORIES=	graphics
6
CATEGORIES=	graphics
8
MASTER_SITES=	SF/djvu/DjView/${PORTVERSION}
7
MASTER_SITES=	SF/djvu/DjView/${PORTVERSION}
9
8
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	Standalone Djvu viewer and plugin based on Qt4 toolkit
10
COMMENT=	Standalone Djvu viewer and plugin based on Qt toolkit
12
11
13
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
15
BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2
16
LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
17
		libtiff.so:${PORTSDIR}/graphics/tiff
16
18
19
INSTALL_TARGET=	install-strip
17
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
18
USES=		pkgconfig webplugin:native libtool
21
USES=	autoreconf desktop-file-utils gmake libtool pkgconfig \
19
USE_QT4=	gui network rcc_build uic_build moc_build qmake_build
22
		webplugin:native
20
USE_XORG=	sm ice xt
23
USE_XORG=	sm ice xt
21
QT_NONSTANDARD=	yes
22
CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
24
CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
23
		--x-libraries="${LOCALBASE}/lib"
25
		--x-libraries="${LOCALBASE}/lib"
24
CONFIGURE_ENV=	QMAKE="${QMAKE}" \
26
CONFIGURE_ENV=	LRELEASE="${LRELEASE}" LUPDATE="${LUPDATE}"
25
		QMAKESPEC="${QMAKESPEC}"
26
LDFLAGS+=	-L${LOCALBASE}/lib
27
CFLAGS+=	-I${LOCALBASE}/include
28
CXXFLAGS+=	-I${LOCALBASE}/include
29
MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
30
27
31
WRKSRC=		${WRKDIR}/djview4-${PORTVERSION}
28
CPPFLAGS+=	-I${LOCALBASE}/include
29
LDFLAGS+=	-L${LOCALBASE}/lib
32
30
33
WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
31
WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
34
WEBPLUGIN_FILES=	nsdejavu.so
32
WEBPLUGIN_FILES=	nsdejavu.so
35
33
36
post-patch:
34
OPTIONS_SINGLE=	QT
37
	@${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \
35
OPTIONS_SINGLE_QT=	QT4 QT5
38
		${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in
36
OPTIONS_DEFAULT=	QT5
39
	@${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,@NSDEJAVU_LIBS@ -lXt -lXext,g' \
37
40
		${WRKSRC}/nsdejavu/Makefile.in
38
QT4_USE=	QT4=gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build
39
QT5_USE=	QT5=gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build
40
41
post-patch: .SILENT
42
# Allow to strip binary
43
	${REINPLACE_CMD} -e '/^bin_/s/SCRIPTS/PROGRAMS/' \
44
		${WRKSRC}/src/Makefile.am
45
# Change plugins directory
46
# Add GLIB cflags and libs (including -lX*)
47
	${REINPLACE_CMD} -e '/^pluginsdir/s/mozilla/djview4/ ; \
48
		/NSDEJAVU_CFLAGS/s|$$| $$\(GLIB_CFLAGS\)| ; \
49
		/NSDEJAVU_LIBS/s|$$| $$\(GLIB_LIBS\) -lXt -lXext|' \
50
		${WRKSRC}/nsdejavu/Makefile.am
51
52
post-install:
53
# Create a symbolic link to match desktop file exec name
54
	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ${PORTNAME} ${PORTNAME}4)
41
55
42
.include <bsd.port.mk>
56
.include <bsd.port.mk>
(-)djview4/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (djview-4.9.tar.gz) = d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c
1
SHA256 (djview-4.10.tar.gz) = 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f
2
SIZE (djview-4.9.tar.gz) = 930676
2
SIZE (djview-4.10.tar.gz) = 1077198
(-)djview4/files/patch-desktopfiles_Makefile.in (-34 lines)
Lines 1-34 Link Here
1
--- desktopfiles/Makefile.in.orig	2012-04-09 20:56:55.000000000 -0700
2
+++ desktopfiles/Makefile.in	2012-04-21 20:39:20.000000000 -0700
3
@@ -50,14 +50,14 @@
4
 
5
 hi32-djview4.png hi64-djview4.png: djview.svg
6
 	s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
7
-	  ${RSVG} -w $${s} -h $${s} -o $@ $< \
8
-	  || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
9
+	  ${RSVG} -w $${s} -h $${s} -o $@ $> \
10
+	  || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $> $@ \
11
 	  || ${INKSCAPE} --without-gui --export-width=$${s} \
12
-                         --export-height=$${s} --export-png=$@ $< \
13
+                         --export-height=$${s} --export-png=$@ $> \
14
 	  || cp ${srcdir}/prebuilt-$@ $@
15
 
16
 hi-djview4.svgz: djview.svg
17
-	gzip <$< >$@
18
+	gzip <${.ALLSRC} >$@
19
 
20
 register-djview-menu: register-djview-menu.in
21
 	sed < ${srcdir}/register-djview-menu.in > register-djview-menu \
22
@@ -74,10 +74,10 @@
23
 
24
 install-djview-files: FORCE
25
 	${INSTALL} -d ${DESTDIR}${datadir_djview}
26
-	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
27
+	${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
28
 	${INSTALL_DATA} *djview4.png ${DESTDIR}${datadir_djview}
29
 	${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
30
-	${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
31
+	${INSTALL_DATA} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
32
 	-@echo "Run ${datadir_djview}/register-djview-menu install"
33
 	-@echo " to register the djview3 menu entries."
34
 
(-)djview4/files/patch-src_Makefile.am (+53 lines)
Line 0 Link Here
1
# Origin: http://sourceforge.net/p/djvu/djview-git/ci/e664af/tree/src/Makefile.am?diff=975258
2
# Commit message: simplified lrelease rule
3
--- src/Makefile.am
4
+++ src/Makefile.am
5
@@ -36,17 +36,14 @@
6
 
7
 lrelease_verbose = $(lrelease_verbose_@AM_V@)
8
 lrelease_verbose_ = $(lrelease_verbose_@AM_DEFAULT_V@)
9
-lrelease_verbose_0 = @
10
+lrelease_verbose_0 = @echo "  LRELEASE" $@;
11
 
12
-$(qmake_qm): qm.dir/lrelease-stamp
13
-	$(lrelease_verbose)cmp -s qm.dir/$@ $@ || cp qm.dir/$@ $@
14
+$(qmake_qm): djview
15
 
16
-qm.dir/lrelease-stamp: $(qmake_ts) djview
17
-	$(lrelease_verbose)test -d qm.dir || $(MKDIR) qm.dir ; \
18
-	 for ts in $(qmake_ts); do cp $(srcdir)/$$ts qm.dir; done ; \
19
-	 for ts in $(qmake_ts); do echo "TRANSLATIONS += $$ts" ; done > qm.dir/ts.pro
20
-	$(lrelease_verbose)cd qm.dir && $(LRELEASE) ts.pro
21
-	$(lrelease_verbose)touch $@
22
+SUFFIXES=.ts .qm
23
+
24
+.ts.qm:
25
+	$(lrelease_verbose)$(LRELEASE) -silent $< -qm $@
26
 
27
 # invoke qmake
28
 
29
@@ -72,20 +69,15 @@
30
 
31
 # cleaning
32
 
33
-mostlyclean-local: mostlyclean-qmake mostlyclean-qm
34
+mostlyclean-local: mostlyclean-qmake
35
 
36
 mostlyclean-qmake:
37
 	-test "${srcdir}" == "." || ${RM} djview.pro
38
 	-test -f Makefile.qmake && ${MAKE} -f Makefile.qmake clean
39
 	-$(RM) Makefile.qmake
40
 
41
-mostlyclean-qm:
42
-	-${RM} *.qm qm.dir/*
43
-	-${RMDIR} qm.dir
44
+.PHONY: mostlyclean-qmake mostlyclean-qm 
45
+
46
+MOSTLYCLEANFILES = djview $(qmake_qm)
47
 
48
 
49
-.PHONY: mostlyclean-qmake mostlyclean-qm 
50
-
51
-MOSTLYCLEANFILES = djview
52
-
53
-
(-)djview4/pkg-descr (-1 / +1 lines)
Lines 1-4 Link Here
1
Standalone Djvu viewer and plugin based on the Qt4 toolkit. Uses djvulibre
1
Standalone Djvu viewer and plugin based on the Qt toolkit. Uses djvulibre
2
for rendering.
2
for rendering.
3
3
4
Author:	Leon Bottou <leonb@users.sf.net>
4
Author:	Leon Bottou <leonb@users.sf.net>
(-)djview4/pkg-plist (-8 / +12 lines)
Lines 2-13 Link Here
2
bin/djview4
2
bin/djview4
3
lib/djview4/plugins/nsdejavu.so
3
lib/djview4/plugins/nsdejavu.so
4
man/man1/djview.1.gz
4
man/man1/djview.1.gz
5
man/man1/djview4.1.gz
6
man/man1/nsdejavu.1.gz
5
man/man1/nsdejavu.1.gz
7
share/djvu/djview4/desktop/djvulibre-djview4.desktop
6
share/applications/djvulibre-djview4.desktop
8
share/djvu/djview4/desktop/hi-djview4.svgz
7
share/djvu/djview4/djview_cs.qm
9
share/djvu/djview4/desktop/hi32-djview4.png
8
share/djvu/djview4/djview_de.qm
10
share/djvu/djview4/desktop/hi64-djview4.png
9
share/djvu/djview4/djview_es.qm
11
share/djvu/djview4/desktop/prebuilt-hi32-djview4.png
10
share/djvu/djview4/djview_fr.qm
12
share/djvu/djview4/desktop/prebuilt-hi64-djview4.png
11
share/djvu/djview4/djview_ru.qm
13
share/djvu/djview4/desktop/register-djview-menu
12
share/djvu/djview4/djview_uk.qm
13
share/djvu/djview4/djview_zh_cn.qm
14
share/djvu/djview4/djview_zh_tw.qm
15
share/icons/hicolor/32x32/mimetypes/djvulibre-djview4.png
16
share/icons/hicolor/64x64/mimetypes/djvulibre-djview4.png
17
share/icons/hicolor/scalable/mimetypes/djvulibre-djview4.svgz

Return to bug 198088