[153934] trunk/dports/gis/routino

[khindenburg at macports.org]

Revision: 153934
          https://trac.macports.org/changeset/153934
Author:   khindenburg at macports.org
Date:     2016-10-16 07:13:59 -0700 (Sun, 16 Oct 2016)
Log Message:
-----------
routino: fix setting prefix

Modified Paths:
--------------
    trunk/dports/gis/routino/Portfile
    trunk/dports/gis/routino/files/patch-Makefile_conf.diff

Modified: trunk/dports/gis/routino/Portfile
===================================================================
--- trunk/dports/gis/routino/Portfile	2016-10-16 13:58:58 UTC (rev 153933)
+++ trunk/dports/gis/routino/Portfile	2016-10-16 14:13:59 UTC (rev 153934)
@@ -5,7 +5,7 @@
 
 name                    routino
 version                 3.0
-
+revision                1
 categories              gis
 platforms               darwin
 maintainers             web.de:framic5 openmaintainer
@@ -36,8 +36,7 @@
 use_configure           no
 
 post-patch {
-    reinplace -W ${worksrcpath} s|prefix=/usr/local|prefix=${prefix}|g Makefile.conf
-    reinplace -W ${worksrcpath} s|docdir=\$(prefix)/doc/routino|docdir=\$(prefix)/share/doc/routino|g Makefile.conf
+    reinplace -W ${worksrcpath} s|@PREFIX@|${prefix}|g Makefile.conf
 }
 
 build.args-append       CC=${configure.cc} \

Modified: trunk/dports/gis/routino/files/patch-Makefile_conf.diff
===================================================================
--- trunk/dports/gis/routino/files/patch-Makefile_conf.diff	2016-10-16 13:58:58 UTC (rev 153933)
+++ trunk/dports/gis/routino/files/patch-Makefile_conf.diff	2016-10-16 14:13:59 UTC (rev 153934)
@@ -1,11 +1,25 @@
---- Makefile.conf.orig	2015-10-09 21:34:52.000000000 +0200
-+++ Makefile.conf	2015-10-09 23:15:38.000000000 +0200
+--- Makefile.conf	2015-09-07 14:11:23.000000000 -0400
++++ Makefile.conf	2016-10-16 10:00:41.000000000 -0400
+@@ -45,11 +45,11 @@
+ # Installation locations (edit if required)
+ 
+ ifneq ($(HOST),MINGW)
+-prefix=/usr/local
++prefix=@PREFIX@
+ bindir=$(prefix)/bin
+ incdir=$(prefix)/include
+ libdir=$(prefix)/lib
+-docdir=$(prefix)/doc/routino
++docdir=$(prefix)/share/doc/routino
+ datadir=$(prefix)/share/routino
+ else
+ prefix="c:/Program Files/Routino"
 @@ -89,7 +89,7 @@
  
  # Extra flags for compiling libroutino shared library (visibility of symbols, shared)
  CFLAGS_LIB=-fvisibility=hidden
 -LDFLAGS_LIB=-shared
-+LDFLAGS_LIB=-dynamiclib -install_name /opt/local/lib/$@
++LDFLAGS_LIB=-dynamiclib -install_name @PREFIX@/lib/$@
  
  ifeq ($(HOST),UNIX)
  # Extra flags for compiling libroutino shared library (position independent code)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161016/170abd70/attachment-0002.html>