[108297] trunk/dports

[cal at macports.org]

Revision: 108297
          https://trac.macports.org/changeset/108297
Author:   cal at macports.org
Date:     2013-07-17 17:44:14 -0700 (Wed, 17 Jul 2013)
Log Message:
-----------
libdivecomputer: update to 0.4.1, subsurface: update to 3.1.1, closes #39603, #39604

Modified Paths:
--------------
    trunk/dports/devel/libdivecomputer/Portfile
    trunk/dports/x11/subsurface/Portfile
    trunk/dports/x11/subsurface/files/Makefile.patch

Modified: trunk/dports/devel/libdivecomputer/Portfile
===================================================================
--- trunk/dports/devel/libdivecomputer/Portfile	2013-07-18 00:09:53 UTC (rev 108296)
+++ trunk/dports/devel/libdivecomputer/Portfile	2013-07-18 00:44:14 UTC (rev 108297)
@@ -6,7 +6,7 @@
 name                    libdivecomputer
 
 # please, when updating libdivecomputer, check whether subsurface still builds against the new version
-version                 0.3.0
+version                 0.4.1
 epoch                   1
 categories              devel
 platforms               darwin
@@ -25,8 +25,8 @@
 homepage                http://www.divesoftware.org/libdc/
 master_sites            http://www.divesoftware.org/libdc/releases/
 
-checksums               rmd160 7caac71513a4b300a609de68ed7e46b7bc31bc1b \
-                        sha256 84a496dab7d6e5e88bcf197015e5fc3b568492545cb0b55b9007e13f5820a5c0
+checksums               rmd160 63b5d8eeb36c58a3736f5daddb12ec2fab85542e \
+                        sha256 7d64032d2e5cd4d6315ebb7ed5bcccc9399166d40228ae2e96e435749b950a0a
 
 depends_lib             port:gconf \
                         port:gtk2 \

Modified: trunk/dports/x11/subsurface/Portfile
===================================================================
--- trunk/dports/x11/subsurface/Portfile	2013-07-18 00:09:53 UTC (rev 108296)
+++ trunk/dports/x11/subsurface/Portfile	2013-07-18 00:44:14 UTC (rev 108297)
@@ -5,7 +5,7 @@
 PortGroup               github 1.0
 
 # when updating subsurface, it's probably a good idea to update libdivecomputer, too
-github.setup            torvalds subsurface 3.0.2 v
+github.setup            torvalds subsurface 3.1.1 v
 epoch                   1
 categories              x11
 platforms               darwin
@@ -16,8 +16,8 @@
 long_description        ${description}
 
 homepage                http://subsurface.hohndel.org/
-checksums               rmd160  d822139199ca659760aea50992eb7f0aebe6ab5d \
-                        sha256  61747523d4286b339c3cf7c4a495a0f24244dff797bb6c680e248aa03d1ffec5
+checksums               rmd160  049ce041fa50be02752e8b097c3d5adca2e9ff6f \
+                        sha256  d9db76238435fc0dcb24e4957a33aed6aa8e50496b121009327ab48abfa14954
 
 patchfiles              Makefile.patch
 
@@ -31,7 +31,9 @@
                         port:gtk-osx-application \
                         port:osm-gps-map \
                         port:libsoup \
-                        port:py27-pygtk
+                        port:py27-pygtk \
+                        port:libzip \
+                        port:libxslt
 
 # declare universal variant, so get_canonical_archflags works
 variant universal       {}

Modified: trunk/dports/x11/subsurface/files/Makefile.patch
===================================================================
--- trunk/dports/x11/subsurface/files/Makefile.patch	2013-07-18 00:09:53 UTC (rev 108296)
+++ trunk/dports/x11/subsurface/files/Makefile.patch	2013-07-18 00:44:14 UTC (rev 108297)
@@ -1,7 +1,7 @@
---- Makefile.orig	2013-02-20 21:06:34.000000000 +0100
-+++ Makefile	2013-02-20 22:48:49.000000000 +0100
-@@ -1,7 +1,7 @@
- VERSION=2.9
+--- Makefile.orig	2013-06-30 18:47:46.000000000 +0200
++++ Makefile	2013-07-02 13:13:04.000000000 +0200
+@@ -5,7 +5,7 @@
+ VERSION=3.1.1
  
  CC=gcc
 -CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
@@ -9,7 +9,7 @@
  INSTALL=install
  PKGCONFIG=pkg-config
  XML2CONFIG=xml2-config
-@@ -9,7 +9,7 @@
+@@ -13,7 +13,7 @@
  
  # these locations seem to work for SuSE and Fedora
  # prefix = $(HOME)
@@ -18,7 +18,7 @@
  BINDIR = $(prefix)/bin
  DATADIR = $(prefix)/share
  DESKTOPDIR = $(DATADIR)/applications
-@@ -53,8 +53,8 @@
+@@ -81,8 +81,8 @@
  	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
  	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
  else
@@ -29,12 +29,12 @@
  libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
  libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
  
-@@ -122,7 +122,7 @@
+@@ -154,7 +154,7 @@
  else ifeq ($(UNAME), darwin)
  	OSSUPPORT = macos
  	OSSUPPORT_CFLAGS = $(GTKCFLAGS)
--	MACOSXINSTALL = /Applications/Subsurface.app
-+	MACOSXINSTALL = ${mpappdir}/Subsurface.app
+-	MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
++	MACOSXINSTALL = ${mpappdir}/$(CAPITALIZED_NAME).app
  	MACOSXFILES = packaging/macosx
- 	MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
+ 	MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
  	INFOPLIST = $(MACOSXFILES)/Info.plist
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130717/4d57e8d8/attachment-0001.html>