Revision: 145204 https://trac.macports.org/changeset/145204 Author: michaelld@macports.org Date: 2016-01-28 05:49:27 -0800 (Thu, 28 Jan 2016) Log Message: ----------- djview: + fix qmake patch to handle yet another invalid -arch case; + add patch to hopefully allow building on Apple's PPC; + no rev bump needed. Modified Paths: -------------- trunk/dports/aqua/djview/Portfile trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff Added Paths: ----------- trunk/dports/aqua/djview/files/patch-powerpc.diff Modified: trunk/dports/aqua/djview/Portfile =================================================================== --- trunk/dports/aqua/djview/Portfile 2016-01-28 13:35:46 UTC (rev 145203) +++ trunk/dports/aqua/djview/Portfile 2016-01-28 13:49:27 UTC (rev 145204) @@ -24,7 +24,8 @@ master_sites sourceforge:project/djvu/DjView/${version}/ patchfiles patch-makefile-target-fix.diff \ - patch-makefile-qmake-workaround.diff + patch-makefile-qmake-workaround.diff \ + patch-powerpc.diff checksums rmd160 859dcdbfd43ecf7506786f5658ca12ce6041d83d \ sha256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f Modified: trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff =================================================================== --- trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2016-01-28 13:35:46 UTC (rev 145203) +++ trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2016-01-28 13:49:27 UTC (rev 145204) @@ -5,27 +5,27 @@ # so this patch modifies the Makefile rule which creates # Makefile.qmake to remove the '-arch' flag. ---- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400 -+++ src/Makefile.am 2015-03-14 14:26:15.000000000 -0400 +--- src/Makefile.am.orig ++++ src/Makefile.am @@ -68,7 +68,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) 's/-arch *-/-/g' > $@ ++ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@ # cleaning ---- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400 -+++ src/Makefile.in 2015-03-14 14:26:46.000000000 -0400 +--- src/Makefile.in.orig ++++ src/Makefile.in @@ -677,7 +677,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) 's/-arch *-/-/g' > $@ ++ $(SED) -e 's/-arch *-/-/g' -e 's/-arch *$$//g' > $@ # cleaning Added: trunk/dports/aqua/djview/files/patch-powerpc.diff =================================================================== --- trunk/dports/aqua/djview/files/patch-powerpc.diff (rev 0) +++ trunk/dports/aqua/djview/files/patch-powerpc.diff 2016-01-28 13:49:27 UTC (rev 145204) @@ -0,0 +1,31 @@ +--- npdjvu/qtnpapi.h.orig ++++ npdjvu/qtnpapi.h +@@ -248,7 +248,7 @@ struct NPByteRange + # define getFocusEvent (osEvt + 16) + # define loseFocusEvent (osEvt + 17) + # define adjustCursorEvent (osEvt + 18) +-# if defined(__ppc__) || defined(__powerpc__) // LYB 2009-03-10 ++# if defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__) || defined(__powerpc64__) + # define QTBROWSER_USE_CFM + # endif + #endif +--- nsdejavu/npsdk/prcpucfg.h.orig ++++ nsdejavu/npsdk/prcpucfg.h +@@ -48,7 +48,7 @@ + + #define PR_AF_INET6 10 /* same as AF_INET6 */ + +-#ifdef __powerpc64__ ++#if defined(__ppc64__) || defined(__powerpc64__) + + #ifdef __LITTLE_ENDIAN__ + #undef IS_BIG_ENDIAN +@@ -99,7 +99,7 @@ + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + +-#elif defined(__powerpc__) ++#elif defined(__ppc__) || defined(__powerpc__) + + #undef IS_LITTLE_ENDIAN + #define IS_BIG_ENDIAN 1