On Sun, Mar 29, 2015 at 03:54:39PM +0500, Alexandr Shadchin wrote:
> Hi,
>
> This diff updates djview4 to the latest release.
> Tested on amd64.
>
> Comments ? OK ?
>
Update to 4.10.3.
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/djview4/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 27 Mar 2015 08:11:28 -0000 1.22
+++ Makefile 9 May 2015 18:11:50 -0000
@@ -2,8 +2,7 @@
COMMENT= portable DjVu viewer and browser plugin
-DISTNAME= djview-4.9
-REVISION= 1
+DISTNAME= djview-4.10.3
PKGNAME= ${DISTNAME:S/djview/djview4/}
CATEGORIES= graphics print
@@ -14,12 +13,13 @@ MAINTAINER= Alexandr Shadchin <shadchin@
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ICE QtGui QtNetwork SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c djvulibre fontconfig freetype m pthread stdc++ tiff
+WANTLIB += GL ICE QtGui QtNetwork QtOpenGL SM X11 Xext Xi Xinerama
+WANTLIB += Xrender c djvulibre fontconfig freetype glib-2.0 m
+WANTLIB += pcre pthread stdc++ tiff
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
-MODULES= x11/qt4
+MODULES= x11/qt4 devel/gettext
LIB_DEPENDS= graphics/djvulibre
@@ -35,6 +35,6 @@ CONFIGURE_ENV+= QTDIR="${MODQT4_QTDIR}"
NO_TEST= Yes
-WRKDIST= ${WRKDIR}/${DISTNAME:S/djview/djview4/}
+LIBTOOL_FLAGS= --tag=disable-static
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/djview4/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 12 Jan 2013 14:03:41 -0000 1.6
+++ distinfo 9 May 2015 18:11:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (djview-4.9.tar.gz) = 0VD1V6qgczVtd8H15WampWYoHfX5I5W2giE58OXJDgw=
-SIZE (djview-4.9.tar.gz) = 930676
+SHA256 (djview-4.10.3.tar.gz) = ULgOzdxa7APEmILJGzry9Cq/6EVNXdwB+zE+NIHmqyU=
+SIZE (djview-4.10.3.tar.gz) = 1119618
Index: patches/patch-desktopfiles_Makefile_in
===================================================================
RCS file: patches/patch-desktopfiles_Makefile_in
diff -N patches/patch-desktopfiles_Makefile_in
--- patches/patch-desktopfiles_Makefile_in 12 Jan 2013 14:03:41 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-desktopfiles_Makefile_in,v 1.2 2013/01/12 14:03:41 shadchin
Exp $
---- desktopfiles/Makefile.in.orig Tue Apr 10 09:56:55 2012
-+++ desktopfiles/Makefile.in Sun Apr 15 22:10:40 2012
-@@ -40,6 +40,8 @@ XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
- RM = @RM@
-
- datadir_djview = ${datadir}/djvu/djview4/desktop
-+datadir_applications = ${datadir}/applications
-+datadir_icons = ${datadir}/icons/hicolor
-
-
- # -------- all
-@@ -73,13 +75,14 @@ register-djview-menu: register-djview-menu.in
- install: install-djview-files
-
- install-djview-files: FORCE
-- ${INSTALL} -d ${DESTDIR}${datadir_djview}
-- ${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
-- ${INSTALL_DATA} *djview4.png ${DESTDIR}${datadir_djview}
-- ${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
-- ${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop
${DESTDIR}${datadir_djview}
-- -@echo "Run ${datadir_djview}/register-djview-menu install"
-- -@echo " to register the djview3 menu entries."
-+ ${INSTALL} -d ${DESTDIR}${datadir_applications}
-+ ${INSTALL_DATA} djvulibre-djview4.desktop
${DESTDIR}${datadir_applications}/djvulibre-djview4.desktop
-+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/32x32/apps
-+ ${INSTALL_DATA} hi32-djview4.png
${DESTDIR}${datadir_icons}/32x32/apps/djvulibre-djview4.png
-+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/64x64/apps
-+ ${INSTALL_DATA} hi64-djview4.png
${DESTDIR}${datadir_icons}/64x64/apps/djvulibre-djview4.png
-+ ${INSTALL} -d ${DESTDIR}${datadir_icons}/scalable/apps
-+ ${INSTALL_DATA} djview.svg
${DESTDIR}${datadir_icons}/scalable/apps/djvulibre-djview4.svg
-
- # -------- misc
-
Index: patches/patch-desktopfiles_djvulibre-djview4_desktop
===================================================================
RCS file: patches/patch-desktopfiles_djvulibre-djview4_desktop
diff -N patches/patch-desktopfiles_djvulibre-djview4_desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-desktopfiles_djvulibre-djview4_desktop 9 May 2015
18:11:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- desktopfiles/djvulibre-djview4.desktop.orig Sun Mar 29 14:01:01 2015
++++ desktopfiles/djvulibre-djview4.desktop Sun Mar 29 14:01:10 2015
+@@ -3,7 +3,7 @@ Type=Application
+ Categories=Qt;Graphics;Viewer;
+ MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu;
+ Name=DjView4
+-Exec=djview4 %f
++Exec=djview %f
+ Terminal=false
+ Icon=djvulibre-djview4
+ StartupWMClass=Djview4
Index: patches/patch-nsdejavu_Makefile_in
===================================================================
RCS file: patches/patch-nsdejavu_Makefile_in
diff -N patches/patch-nsdejavu_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-nsdejavu_Makefile_in 9 May 2015 18:11:50 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- nsdejavu/Makefile.in.orig Fri Apr 17 02:55:25 2015
++++ nsdejavu/Makefile.in Sat May 9 22:43:23 2015
+@@ -144,7 +144,7 @@ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ nsdejavu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(nsdejavu_la_CFLAGS) \
+- $(CFLAGS) $(nsdejavu_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CFLAGS) $(nsdejavu_la_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) -o $@
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -495,7 +495,7 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+ nsdejavu_la-nsdejavu.lo: nsdejavu.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(nsdejavu_la_CPPFLAGS) $(CPPFLAGS)
$(nsdejavu_la_CFLAGS) $(CFLAGS) -MT nsdejavu_la-nsdejavu.lo -MD -MP -MF
$(DEPDIR)/nsdejavu_la-nsdejavu.Tpo -c -o nsdejavu_la-nsdejavu.lo `test -f
'nsdejavu.c' || echo '$(srcdir)/'`nsdejavu.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(nsdejavu_la_CPPFLAGS) $(CPPFLAGS)
$(nsdejavu_la_CFLAGS) $(CFLAGS) $(GLIB_CFLAGS) -MT nsdejavu_la-nsdejavu.lo -MD
-MP -MF $(DEPDIR)/nsdejavu_la-nsdejavu.Tpo -c -o nsdejavu_la-nsdejavu.lo `test
-f 'nsdejavu.c' || echo '$(srcdir)/'`nsdejavu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nsdejavu_la-nsdejavu.Tpo
$(DEPDIR)/nsdejavu_la-nsdejavu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='nsdejavu.c'
object='nsdejavu_la-nsdejavu.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
Index: patches/patch-nsdejavu_nsdejavu_1_in
===================================================================
RCS file: /cvs/ports/graphics/djview4/patches/patch-nsdejavu_nsdejavu_1_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-nsdejavu_nsdejavu_1_in
--- patches/patch-nsdejavu_nsdejavu_1_in 25 Nov 2014 13:37:19 -0000
1.1
+++ patches/patch-nsdejavu_nsdejavu_1_in 9 May 2015 18:11:50 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-nsdejavu_nsdejavu_1_in,v 1.1 2014/11/25 13:37:19 schwarze Exp $
-Requires tbl(1).
---- nsdejavu/nsdejavu.1.in.orig Tue Apr 10 05:56:55 2012
-+++ nsdejavu/nsdejavu.1.in Mon Nov 24 22:39:46 2014
-@@ -1,3 +1,4 @@
+$OpenBSD$
+--- nsdejavu/nsdejavu.1.in.orig Sat May 9 23:04:56 2015
++++ nsdejavu/nsdejavu.1.in Sat May 9 23:05:01 2015
+@@ -1,4 +1,4 @@
+-.\" t
+'\" t
.\" -*- nroff -*-
.\"
Index: patches/patch-src_djview_1
===================================================================
RCS file: /cvs/ports/graphics/djview4/patches/patch-src_djview_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_djview_1
--- patches/patch-src_djview_1 25 Nov 2014 13:37:19 -0000 1.1
+++ patches/patch-src_djview_1 9 May 2015 18:11:50 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-src_djview_1,v 1.1 2014/11/25 13:37:19 schwarze Exp $
-Requires tbl(1).
---- src/djview.1.orig Tue Apr 10 05:56:55 2012
-+++ src/djview.1 Mon Nov 24 22:31:15 2014
-@@ -1,3 +1,4 @@
+$OpenBSD$
+--- src/djview.1.orig Sat May 9 23:04:37 2015
++++ src/djview.1 Sat May 9 23:04:45 2015
+@@ -1,4 +1,4 @@
+-.\" t
+'\" t
+ .\"
.\" Copyright (c) 2007- Leon Bottou
.\"
- .\" This is free documentation; you can redistribute it and/or
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 24 Nov 2007 13:23:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/11/24 13:23:26 steven Exp $
-lib/netscape/plugins/nsdejavu.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/djview4/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 12 Jan 2013 14:03:41 -0000 1.6
+++ pkg/PLIST 9 May 2015 18:11:50 -0000
@@ -1,25 +1,25 @@
@comment $OpenBSD: PLIST,v 1.6 2013/01/12 14:03:41 shadchin Exp $
-%%SHARED%%
-bin/djview
-@bin bin/djview4
-lib/netscape/
-lib/netscape/plugins/
+@bin bin/djview
+lib/mozilla/
+lib/mozilla/plugins/
+lib/mozilla/plugins/nsdejavu.la
+lib/mozilla/plugins/nsdejavu.so
@man man/man1/djview.1
-@man man/man1/djview4.1
@man man/man1/nsdejavu.1
share/applications/djvulibre-djview4.desktop
share/djvu/
share/djvu/djview4/
share/djvu/djview4/djview_cs.qm
share/djvu/djview4/djview_de.qm
+share/djvu/djview4/djview_es.qm
share/djvu/djview4/djview_fr.qm
share/djvu/djview4/djview_ru.qm
share/djvu/djview4/djview_uk.qm
share/djvu/djview4/djview_zh_cn.qm
share/djvu/djview4/djview_zh_tw.qm
-share/icons/hicolor/32x32/apps/djvulibre-djview4.png
-share/icons/hicolor/64x64/apps/djvulibre-djview4.png
-share/icons/hicolor/scalable/apps/djvulibre-djview4.svg
+share/icons/hicolor/32x32/mimetypes/djvulibre-djview4.png
+share/icons/hicolor/64x64/mimetypes/djvulibre-djview4.png
+share/icons/hicolor/scalable/mimetypes/djvulibre-djview4.svgz
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
