[74899] trunk/dports/net/openconnect

[ryandesign at macports.org]

Revision: 74899
          http://trac.macports.org/changeset/74899
Author:   ryandesign at macports.org
Date:     2011-01-05 23:25:43 -0800 (Wed, 05 Jan 2011)
Log Message:
-----------
openconnect: revise how OPT_FLAGS and PREFIX are communicated to the Makefile

Modified Paths:
--------------
    trunk/dports/net/openconnect/Portfile
    trunk/dports/net/openconnect/files/patch-Makefile.diff

Modified: trunk/dports/net/openconnect/Portfile
===================================================================
--- trunk/dports/net/openconnect/Portfile	2011-01-06 07:04:20 UTC (rev 74898)
+++ trunk/dports/net/openconnect/Portfile	2011-01-06 07:25:43 UTC (rev 74899)
@@ -29,16 +29,14 @@
                     rmd160  7a075e73950666b3c955ef8c6d7f91a116c7c967
 
 patchfiles          patch-Makefile.diff
-post-patch {
-    reinplace s|@OPTFLAGS@|${configure.optflags}| ${worksrcpath}/Makefile
-    reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/Makefile
-}
 
 use_configure       no
 
-build.env           CC="${configure.cc} ${configure.cc_archflags}"
+build.args          CC="${configure.cc} ${configure.cc_archflags}" \
+                    RPM_OPT_FLAGS="${configure.optflags}" \
+                    PREFIX=${prefix}
 
-destroot.destdir    DESTDIR=${destroot}${prefix}
+destroot.args       PREFIX=${prefix}
 
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/net/openconnect/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/openconnect/files/patch-Makefile.diff	2011-01-06 07:04:20 UTC (rev 74898)
+++ trunk/dports/net/openconnect/files/patch-Makefile.diff	2011-01-06 07:25:43 UTC (rev 74899)
@@ -1,25 +1,25 @@
---- Makefile.orig	2010-06-24 21:04:05.000000000 -0400
-+++ Makefile	2010-06-24 21:08:46.000000000 -0400
-@@ -7,7 +7,7 @@
+--- Makefile.orig	2010-09-21 18:05:36.000000000 -0500
++++ Makefile	2011-01-05 01:13:29.000000000 -0600
+@@ -4,6 +4,8 @@
+ #
+ # OPENSSL := ../openssl-0.9.8i
+ 
++PREFIX=/usr
++
  ifdef RPM_OPT_FLAGS
  OPT_FLAGS := $(RPM_OPT_FLAGS)
  else
--OPT_FLAGS := -O2 -g -Wall
-+OPT_FLAGS := @OPTFLAGS@
- endif
- 
- # Allow people to override OpenSSL and build it statically, if they need
-@@ -17,10 +17,10 @@
+@@ -17,10 +19,10 @@
  SSL_CFLAGS += -I$(OPENSSL)/include
  SSL_LDFLAGS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
  else
 -ifeq ($(wildcard /usr/include/openssl),)
 -$(error "No OpenSSL in /usr/include/openssl. Cannot continue");
-+ifeq ($(wildcard @PREFIX@/include/openssl),)
-+$(error "No OpenSSL in @PREFIX@/include/openssl. Cannot continue");
++ifeq ($(wildcard $(PREFIX)/include/openssl),)
++$(error "No OpenSSL in $(PREFIX)/include/openssl. Cannot continue");
  endif
 -SSL_CFLAGS += -I/usr/include/openssl
-+SSL_CFLAGS += -I at PREFIX@/include/openssl
++SSL_CFLAGS += -I$(PREFIX)/include/openssl
  SSL_LDFLAGS += -lcrypto -lssl
  endif
  
@@ -29,11 +29,11 @@
  install: all
 -	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/libexec
 -	install -m0755 openconnect $(DESTDIR)/usr/bin
-+	mkdir -p $(DESTDIR)/bin $(DESTDIR)/libexec
-+	install -m0755 openconnect $(DESTDIR)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/libexec
++	install -m0755 openconnect $(DESTDIR)$(PREFIX)/bin
  ifeq ($(MISSINGPKGS),)
 -	install -m0755 nm-openconnect-auth-dialog $(DESTDIR)/usr/libexec
-+	install -m0755 nm-openconnect-auth-dialog $(DESTDIR)/libexec
++	install -m0755 nm-openconnect-auth-dialog $(DESTDIR)$(PREFIX)/libexec
  endif
  
  include /dev/null $(wildcard .*.o.dep)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110105/bb32f4fe/attachment-0001.html>