[146002] trunk/dports/aqua/djview
nicos at macports.org
nicos at macports.org
Wed Feb 24 07:40:43 PST 2016
Revision: 146002
https://trac.macports.org/changeset/146002
Author: nicos at macports.org
Date: 2016-02-24 07:40:43 -0800 (Wed, 24 Feb 2016)
Log Message:
-----------
djview: update to 4.10.5
Modified Paths:
--------------
trunk/dports/aqua/djview/Portfile
trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff
Removed Paths:
-------------
trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff
trunk/dports/aqua/djview/files/patch-test-nsdejavu-no.diff
Modified: trunk/dports/aqua/djview/Portfile
===================================================================
--- trunk/dports/aqua/djview/Portfile 2016-02-24 13:05:07 UTC (rev 146001)
+++ trunk/dports/aqua/djview/Portfile 2016-02-24 15:40:43 UTC (rev 146002)
@@ -5,8 +5,7 @@
PortGroup qt4 1.0
name djview
-version 4.10
-revision 1
+version 4.10.5
categories aqua graphics www
license GPL-2+ MIT
maintainers nicos openmaintainer
@@ -21,15 +20,13 @@
homepage http://djvu.sourceforge.net/djview4.html
-master_sites sourceforge:project/djvu/DjView/${version}/
+master_sites sourceforge:project/djvu/DjView/4.10/
-patchfiles patch-makefile-target-fix.diff \
- patch-makefile-qmake-workaround.diff \
- patch-powerpc.diff \
- patch-test-nsdejavu-no.diff
+patchfiles patch-powerpc.diff \
+ patch-makefile-qmake-workaround.diff
-checksums rmd160 859dcdbfd43ecf7506786f5658ca12ce6041d83d \
- sha256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f
+checksums rmd160 6fbdc99db79ed96d0944a6c9c32f72a57dd54936 \
+ sha256 a0b302807106053d1983659ebb0139c7b1c393b3e6407f1f47990d7e3c5d7b3d
depends_lib-append \
port:djvulibre
Modified: trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2016-02-24 13:05:07 UTC (rev 146001)
+++ trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2016-02-24 15:40:43 UTC (rev 146002)
@@ -5,27 +5,29 @@
# so this patch modifies the Makefile rule which creates
# Makefile.qmake to remove the '-arch' flag.
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -68,7 +68,8 @@
+diff -ur ../djview-4.10.5-orig/src/Makefile.am ./src/Makefile.am
+--- ../djview-4.10.5-orig/src/Makefile.am 2015-12-27 01:57:08.000000000 +0900
++++ ./src/Makefile.am 2016-02-25 00:04:55.000000000 +0900
+@@ -65,7 +65,8 @@
QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
LIBS+='$(QMAKELIBS)' \
- VPATH='$(srcdir)' -o - djview.pro |\
-- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
-+ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
-+ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@
+ VPATH='$(srcdir)' -o $@0 djview.pro
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk < $@0 > $@ && ${RM} $@0
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk < $@0 |\
++ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@ && ${RM} $@0
# cleaning
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -677,7 +677,8 @@
+diff -ur ../djview-4.10.5-orig/src/Makefile.in ./src/Makefile.in
+--- ../djview-4.10.5-orig/src/Makefile.in 2016-01-07 21:28:37.000000000 +0900
++++ ./src/Makefile.in 2016-02-25 00:05:42.000000000 +0900
+@@ -678,7 +678,8 @@
QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
LIBS+='$(QMAKELIBS)' \
- VPATH='$(srcdir)' -o - djview.pro |\
-- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
-+ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
-+ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@
+ VPATH='$(srcdir)' -o $@0 djview.pro
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk < $@0 > $@ && ${RM} $@0
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk < $@0 |\
++ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@ && ${RM} $@0
# cleaning
Deleted: trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff 2016-02-24 13:05:07 UTC (rev 146001)
+++ trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff 2016-02-24 15:40:43 UTC (rev 146002)
@@ -1,22 +0,0 @@
---- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400
-+++ src/Makefile.am 2015-03-14 13:52:37.000000000 -0400
-@@ -12,7 +12,7 @@
- bin_SCRIPTS = djview
-
- djview: Makefile.qmake FORCE
-- ${MAKE} -f Makefile.qmake djview
-+ ${MAKE} -f Makefile.qmake
-
- FORCE:
-
---- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400
-+++ src/Makefile.in 2015-03-14 13:53:29.000000000 -0400
-@@ -649,7 +649,7 @@
- $(AWK) -f $(top_srcdir)/config/qmsources.awk < $< > $@
-
- djview: Makefile.qmake FORCE
-- ${MAKE} -f Makefile.qmake djview
-+ ${MAKE} -f Makefile.qmake
-
- FORCE:
-
Deleted: trunk/dports/aqua/djview/files/patch-test-nsdejavu-no.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-test-nsdejavu-no.diff 2016-02-24 13:05:07 UTC (rev 146001)
+++ trunk/dports/aqua/djview/files/patch-test-nsdejavu-no.diff 2016-02-24 15:40:43 UTC (rev 146002)
@@ -1,11 +0,0 @@
---- configure.orig
-+++ configure
-@@ -19743,7 +19744,7 @@ if test "$ac_nsdejavu" != no ; then
-
- fi
-
-- if test "x${ac_nsdejavu}" != "no"; then
-+ if test "x${ac_nsdejavu}" != "xno"; then
- WANT_NSDEJAVU_TRUE=
- WANT_NSDEJAVU_FALSE='#'
- else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160224/02297145/attachment-0001.html>
More information about the macports-changes
mailing list