[104735] trunk/dports

1 Apr 2013

Revision: 104735
          https://trac.macports.org/changeset/104735
Author:   cal@macports.org
Date:     2013-04-01 14:58:20 -0700 (Mon, 01 Apr 2013)
Log Message:
-----------
subsurface: update to 3.0.2, libdivecomputer: update to 0.3.0, closes #36885

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-04-01 21:44:06 UTC (rev 104734)
+++ trunk/dports/devel/libdivecomputer/Portfile	2013-04-01 21:58:20 UTC (rev 104735)
@@ -4,8 +4,10 @@
 PortSystem              1.0
 
 name                    libdivecomputer
+
 # please, when updating libdivecomputer, check whether subsurface still builds against the new version
-version                 2012011900
+version                 0.3.0
+epoch                   1
 categories              devel
 platforms               darwin
 license                 LGPL-2.1
@@ -21,11 +23,11 @@
                         Aquatics.
 
 homepage                http://www.divesoftware.org/libdc/
-fetch.type              git
-git.url                 git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer
-# latest as of 2012-01-19
-git.branch              87397a4ea1c63d78efd9bf751dee19f54257a6f9
+master_sites            http://www.divesoftware.org/libdc/releases/
 
+checksums               rmd160 7caac71513a4b300a609de68ed7e46b7bc31bc1b \
+                        sha256 84a496dab7d6e5e88bcf197015e5fc3b568492545cb0b55b9007e13f5820a5c0
+
 depends_lib             port:gconf \
                         port:gtk2 \
                         path:lib/pkgconfig/libusb-1.0.pc:libusb

Modified: trunk/dports/x11/subsurface/Portfile
===================================================================
--- trunk/dports/x11/subsurface/Portfile	2013-04-01 21:44:06 UTC (rev 104734)
+++ trunk/dports/x11/subsurface/Portfile	2013-04-01 21:58:20 UTC (rev 104735)
@@ -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 1.2 v
+github.setup            torvalds subsurface 3.0.2 v
 epoch                   1
 categories              x11
 platforms               darwin
@@ -16,8 +16,8 @@
 long_description        ${description}
 
 homepage                http://subsurface.hohndel.org/
-checksums               rmd160  f6c3251dc762c6396b18662b680493f94558a503 \
-                        sha256  aa0cf4cbbb8ecafd78f17ee224b4dfc52814216fded0c83a9c977e382c21116e
+checksums               rmd160  d822139199ca659760aea50992eb7f0aebe6ab5d \
+                        sha256  61747523d4286b339c3cf7c4a495a0f24244dff797bb6c680e248aa03d1ffec5
 
 patchfiles              Makefile.patch
 
@@ -27,7 +27,11 @@
                         port:gtk2 \
                         port:hicolor-icon-theme \
                         port:gconf \
-                        port:libdivecomputer
+                        port:libdivecomputer \
+                        port:gtk-osx-application \
+                        port:osm-gps-map \
+                        port:libsoup \
+                        port:py27-pygtk
 
 # declare universal variant, so get_canonical_archflags works
 variant universal       {}
@@ -36,14 +40,16 @@
 
 build.args-append       CC=${configure.cc} \
                         EXTRACFLAGS="${configure.cflags} [get_canonical_archflags]" \
-                        LDFLAGS="${configure.ldflags} [get_canonical_archflags] -framework CoreFoundation" \
+                        LDFLAGS="${configure.ldflags} [get_canonical_archflags]" \
                         mpprefix="${prefix}" \
                         mpappdir="${destroot}${applications_dir}" \
-                        prefix="${destroot}${prefix}"
+                        prefix="${destroot}${prefix}" \
+                        VERSION_STRING=${version}
 
 destroot.args-append    CC=${configure.cc} \
                         EXTRACFLAGS="${configure.cflags} [get_canonical_archflags]" \
-                        LDFLAGS="${configure.ldflags} [get_canonical_archflags] -framework CoreFoundation" \
+                        LDFLAGS="${configure.ldflags} [get_canonical_archflags]" \
                         prefix="${destroot}${prefix}" \
                         mpappdir="${destroot}${applications_dir}"
+
 destroot.target         install-macosx

Modified: trunk/dports/x11/subsurface/files/Makefile.patch
===================================================================
--- trunk/dports/x11/subsurface/files/Makefile.patch	2013-04-01 21:44:06 UTC (rev 104734)
+++ trunk/dports/x11/subsurface/files/Makefile.patch	2013-04-01 21:58:20 UTC (rev 104735)
@@ -1,15 +1,15 @@
---- Makefile.orig	2011-12-08 21:20:05.000000000 +0100
-+++ Makefile	2012-01-19 22:38:38.000000000 +0100
-@@ -1,7 +1,6 @@
- VERSION=1.2
+--- 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
  
--CC=gcc
--CFLAGS=-Wall -Wno-pointer-sign -g
-+CFLAGS=-Wall -Wno-pointer-sign -g $(EXTRACFLAGS)
+ CC=gcc
+-CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
++CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE $(EXTRACFLAGS)
  INSTALL=install
  PKGCONFIG=pkg-config
  XML2CONFIG=xml2-config
-@@ -9,7 +8,7 @@
+@@ -9,7 +9,7 @@
  
  # these locations seem to work for SuSE and Fedora
  # prefix = $(HOME)
@@ -18,65 +18,23 @@
  BINDIR = $(prefix)/bin
  DATADIR = $(prefix)/share
  DESKTOPDIR = $(DATADIR)/applications
-@@ -25,7 +24,7 @@
- MANFILES = $(NAME).1
- XSLTFILES = xslt/*.xslt
- 
--MACOSXINSTALL = /Applications/Subsurface.app
-+MACOSXINSTALL = ${mpappdir}/Subsurface.app
- MACOSXFILES = packaging/macosx
- 
- # find libdivecomputer
-@@ -35,40 +34,9 @@
- # subdirectories of /usr/local and /usr and then we give up. You can
- # override by simply setting it here
- #
--ifeq ($(CC), i686-w64-mingw32-gcc)
--# ok, we are cross building for Windows
--	LIBDIVECOMPUTERDIR = /usr/i686-w64-mingw32/sys-root/mingw/include/libdivecomputer
--	LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer`
--	LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer`
--	RESFILE = packaging/windows/subsurface.res
--	LDFLAGS += -Wl,-subsystem,windows
--else
--
+@@ -53,8 +53,8 @@
+ 	LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
+ 	LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
+ else
 -libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
 -libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
--libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
--libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
--
--ifneq ($(strip $(libdc-local)),)
--	LIBDIVECOMPUTERDIR = /usr/local
--	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
--	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
--else ifneq ($(strip $(libdc-local64)),)
--	LIBDIVECOMPUTERDIR = /usr/local
--	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
--	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
--else ifneq ($(strip $(libdc-usr)),)
--	LIBDIVECOMPUTERDIR = /usr
--	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
--	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
--else ifneq ($(strip $(libdc-usr64)),)
--	LIBDIVECOMPUTERDIR = /usr
--	LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
--	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
--else
--$(error Cannot find libdivecomputer - please edit Makefile)
--endif
--endif
-+LIBDIVECOMPUTERDIR = ${mpprefix}
-+LIBDIVECOMPUTERINCLUDES = -I$(LIBDIVECOMPUTERDIR)/include/libdivecomputer
-+LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
++libdc-local := $(wildcard $(prefix)/lib/libdivecomputer.a)
++libdc-local64 := $(wildcard $prefix)/lib64/libdivecomputer.a)
+ libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
+ libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
  
- # Libusb-1.0 is only required if libdivecomputer was built with it.
- # And libdivecomputer is only built with it if libusb-1.0 is
-@@ -116,6 +84,8 @@
- 	parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
- 	gtk-gui.o statistics.o $(OSSUPPORT).o $(RESFILE)
- 
-+all: $(NAME)
-+
- $(NAME): $(OBJS)
- 	$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(LIBS)
- 
+@@ -122,7 +122,7 @@
+ else ifeq ($(UNAME), darwin)
+ 	OSSUPPORT = macos
+ 	OSSUPPORT_CFLAGS = $(GTKCFLAGS)
+-	MACOSXINSTALL = /Applications/Subsurface.app
++	MACOSXINSTALL = ${mpappdir}/Subsurface.app
+ 	MACOSXFILES = packaging/macosx
+ 	MACOSXSTAGING = $(MACOSXFILES)/Subsurface.app
+ 	INFOPLIST = $(MACOSXFILES)/Info.plist

    

cal＠macports.org

tags

participants (1)