[129594] trunk/dports/graphics/qiv

[ryandesign at macports.org]

Revision: 129594
          https://trac.macports.org/changeset/129594
Author:   ryandesign at macports.org
Date:     2014-12-16 11:19:38 -0800 (Tue, 16 Dec 2014)
Log Message:
-----------
qiv: update to 2.3.1; fix build failure with clang (#43951); use get_canonical_archflags

Modified Paths:
--------------
    trunk/dports/graphics/qiv/Portfile
    trunk/dports/graphics/qiv/files/patch-Makefile.diff

Modified: trunk/dports/graphics/qiv/Portfile
===================================================================
--- trunk/dports/graphics/qiv/Portfile	2014-12-16 18:42:36 UTC (rev 129593)
+++ trunk/dports/graphics/qiv/Portfile	2014-12-16 19:19:38 UTC (rev 129594)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                qiv
-version             2.2.3
-revision            2
+version             2.3.1
 categories          graphics
 platforms           darwin
 maintainers         hilaiel.com:lloyd
@@ -19,8 +18,8 @@
 master_sites        ${homepage}download/
 extract.suffix      .tgz
 
-checksums           sha1    0bf8cc9a7d8bdad6bbe9e6ba970890da902a27c8 \
-                    rmd160  b52168e67e6b8c65c924b4642944aa592f0bb4a0
+checksums           rmd160  04a128a3eb96f68c2465e457ab661e0d2d1be8c0 \
+                    sha256  675396b539e6511135fe73c867f9fdd6d912c24c7562797cb047c27d0c2c8ee6
 
 depends_build       port:pkgconfig
 depends_lib         port:imlib2 port:file port:gtk2
@@ -34,13 +33,8 @@
 use_configure       no
 
 variant universal {}
-if {[variant_isset universal]} {
-    set archflags ${configure.universal_cflags}
-} else {
-    set archflags ${configure.cc_archflags}
-}
 
-build.args          CC="${configure.cc} ${archflags}"
+build.args          CC="${configure.cc} [get_canonical_archflags cc]"
 
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]

Modified: trunk/dports/graphics/qiv/files/patch-Makefile.diff
===================================================================
--- trunk/dports/graphics/qiv/files/patch-Makefile.diff	2014-12-16 18:42:36 UTC (rev 129593)
+++ trunk/dports/graphics/qiv/files/patch-Makefile.diff	2014-12-16 19:19:38 UTC (rev 129594)
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-01-10 15:39:08.000000000 -0600
-+++ Makefile	2011-03-29 02:30:01.000000000 -0500
+--- Makefile.orig	2013-12-19 18:50:37.000000000 -0600
++++ Makefile	2014-12-16 13:07:24.000000000 -0600
 @@ -4,7 +4,7 @@
  #######################################################################
  
@@ -8,18 +8,44 @@
 +PREFIX = $(DESTDIR)@PREFIX@
  
  # Font to use for statusbar in fullscreen mode
- STATUSBAR_FONT = "fixed"
-@@ -127,9 +127,11 @@
- 
- install: $(PROGRAM)
- 	@echo "Installing QIV..."
-+	mkdir -p $(PREFIX)/bin
+ STATUSBAR_FONT = "Monospace 9"
+@@ -52,8 +52,7 @@
+ CC        = gcc
+ #CFLAGS    = -O0 -g -Wall
+ CFLAGS    = -O2 -Wall \
+-	    -fcaller-saves -ffast-math -fno-strength-reduce \
+-	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
++	    -ffast-math -fno-strength-reduce
+ #CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
+ #	    -fcaller-saves -ffast-math -fno-strength-reduce \
+ #	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+@@ -143,12 +142,12 @@
+ 	  echo install -d -m 0755 $(PREFIX)/bin; \
+         fi
  	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+-	@if [ ! -e $(PREFIX)/man/man1 ]; then \
+-	  echo install -d -m 0755 $(PREFIX)/man/man1; \
+-	  install -d -m 0755 $(PREFIX)/man/man1; \
++	@if [ ! -e $(PREFIX)/share/man/man1 ]; then \
++	  echo install -d -m 0755 $(PREFIX)/share/man/man1; \
++	  install -d -m 0755 $(PREFIX)/share/man/man1; \
+ 	fi
 -	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 -	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
-+	mkdir -p $(PREFIX)/share/man/man1
 +	install -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
 +	$(COMPRESS_PROG) $(PREFIX)/share/man/man1/$(PROGRAM).1
- 	@if ./qiv -f ./intro.jpg ; \
- 	then echo "-- Test Passed --" ; \
- 	else echo "-- Test Failed --" ; \
+ 	@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
+ 	  echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
+ 	  install -d -m 0755 $(PREFIX)/share/pixmaps; \
+@@ -159,10 +158,7 @@
+ 	  install -d -m 0755 $(PREFIX)/share/applications; \
+ 	fi
+ 	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
+-	@if ./qiv -f ./intro.jpg ; \
+-	then echo "-- Test Passed --" ; \
+-	else echo "-- Test Failed --" ; \
+-	fi
++	@echo "-- Test Skipped --"
+ 	@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/bin/qiv-command\n\n"
+ 
+ # the end... ;-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141216/dab35a8b/attachment.html>