static USE flag now does what it says on the tin, #174786

thanks to Michael Gisbers.
Added a patch to clean up compile and install on FreeBSD.
Package-Manager: portage-2.1.2.4

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index b1be3a4a7a7f870def6ef1e062d685c19ac3ae52..efa5887b827184ef5a67b8fc5beb2a77a489e809 100644 (file)
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.108 2007/03/09 20:56:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.109 2007/04/16 11:43:26 uberlord Exp $
+
+  16 Apr 2007; Roy Marples <uberlord@gentoo.org>
+  +files/openvpn-2.1_rc2-freebsd.patch, openvpn-2.0.6.ebuild,
+  openvpn-2.0.7.ebuild, openvpn-2.0.7-r1.ebuild, openvpn-2.0.7-r2.ebuild,
+  openvpn-2.1_rc2.ebuild:
+  static USE flag now does what it says on the tin, #174786
+  thanks to Michael Gisbers.
+  Added a patch to clean up compile and install on FreeBSD.
 
   09 Mar 2007; Roy Marples <uberlord@gentoo.org> files/openvpn-2.1.init:
   Hide ifconfig errors on FreeBSD.

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0b37ffe926e993025439f764d1b51ce561be515b..fb09854cdb29f1fd0fdef89556c5765a7e69236a 100644 (file)
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -22,6 +22,10 @@ AUX openvpn-2.1_rc1-persistent.patch 1977 RMD160 44a70845a1dac1f169fdf5f45d92770
 MD5 c5392cca1d5862f58bac2a8f40ed5b58 files/openvpn-2.1_rc1-persistent.patch 1977
 RMD160 44a70845a1dac1f169fdf5f45d927709389d3166 files/openvpn-2.1_rc1-persistent.patch 1977
 SHA256 e1e1426aee7b17e784a8477d5efef1a262afd9cd124950d6a8f314c17cdb95c4 files/openvpn-2.1_rc1-persistent.patch 1977
+AUX openvpn-2.1_rc2-freebsd.patch 2542 RMD160 4d265ed92b8878ca0df1bd7a99c068bac92ea059 SHA1 49a577737f8f0965cb0f079e651549b50901b0e6 SHA256 b8f38e4fa02b712ac41b530c0782548c2ba0dbae2bea1026908176ffe5bf003b
+MD5 5eaf6bc5a0efab7a03edadf5bb34e420 files/openvpn-2.1_rc2-freebsd.patch 2542
+RMD160 4d265ed92b8878ca0df1bd7a99c068bac92ea059 files/openvpn-2.1_rc2-freebsd.patch 2542
+SHA256 b8f38e4fa02b712ac41b530c0782548c2ba0dbae2bea1026908176ffe5bf003b files/openvpn-2.1_rc2-freebsd.patch 2542
 AUX openvpn.init 1461 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 SHA1 756afc52a29aae1bc41e5eb43f5604e4d9e39112 SHA256 81782885fe6b65434404e4d5875071cb9a4c70914f25c71826290bb265ab109e
 MD5 8f8bae9823ceafe8b9a1ac24bb4a23da files/openvpn.init 1461
 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 files/openvpn.init 1461
@@ -34,22 +38,22 @@ DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.1_rc1.tar.gz 796620 RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 SHA1 252715678c8d2c5d708267e7947cf89242209f0a SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11
 DIST openvpn-2.1_rc2.tar.gz 802075 RMD160 d9608869ceae3edb610a94b0076d8ac9c818663c SHA1 30e6983bb0cb8c28b89dc438c2804dcf7f70988d SHA256 696630de3b8a8308a508d7ee1965fc5f2d6487ecb3d75e19c249c76f70ebfcb4
-EBUILD openvpn-2.0.6.ebuild 4094 RMD160 2d3fe1a9e2ec9576976aea2efee7ce9f1557c206 SHA1 01b437d82eadc5eac894899a3a765ccf2b90957a SHA256 8cd12c29c1bdd78afb6eeff94ca4c4ecfa2692a321f458a3dbda808f07e653cc
-MD5 803f57674a1427a6699e953d78816c16 openvpn-2.0.6.ebuild 4094
-RMD160 2d3fe1a9e2ec9576976aea2efee7ce9f1557c206 openvpn-2.0.6.ebuild 4094
-SHA256 8cd12c29c1bdd78afb6eeff94ca4c4ecfa2692a321f458a3dbda808f07e653cc openvpn-2.0.6.ebuild 4094
-EBUILD openvpn-2.0.7-r1.ebuild 4210 RMD160 c0fbb1a09b279e9b43d5fe685595ffb2d9075d07 SHA1 d23652455ed234638d5dccb705d615d0f2784cc5 SHA256 d9688d1fb1856926e48985aed2eb14283c71247773224e886c096d5ea87fb193
-MD5 51d7c94dfc4a3c7994a464d09bcbcbef openvpn-2.0.7-r1.ebuild 4210
-RMD160 c0fbb1a09b279e9b43d5fe685595ffb2d9075d07 openvpn-2.0.7-r1.ebuild 4210
-SHA256 d9688d1fb1856926e48985aed2eb14283c71247773224e886c096d5ea87fb193 openvpn-2.0.7-r1.ebuild 4210
-EBUILD openvpn-2.0.7-r2.ebuild 4209 RMD160 89c2cd995fa9737cdf8c4ec99dc2e757f0d7fbfb SHA1 ce1d097f66be475a6690cd9f6aa9c7c730c560f2 SHA256 75a3b316adb34e6ac9546c8de5d0fa39aec1a104aee7c7fcb9f854b5891a5498
-MD5 cddab539e8f3fee2bc38dc18ea54f391 openvpn-2.0.7-r2.ebuild 4209
-RMD160 89c2cd995fa9737cdf8c4ec99dc2e757f0d7fbfb openvpn-2.0.7-r2.ebuild 4209
-SHA256 75a3b316adb34e6ac9546c8de5d0fa39aec1a104aee7c7fcb9f854b5891a5498 openvpn-2.0.7-r2.ebuild 4209
-EBUILD openvpn-2.0.7.ebuild 4163 RMD160 319a6802dedbe00d538d5c8fd9162d7d291ba291 SHA1 a84f36bd6e88da0547ec5708cb02d4d2b7ed0164 SHA256 451a955d927928a68400e6d320ced315b1597cc56a91d474aa3032ba910db259
-MD5 b7439cd88d561a3f02bdf3b5062b02a5 openvpn-2.0.7.ebuild 4163
-RMD160 319a6802dedbe00d538d5c8fd9162d7d291ba291 openvpn-2.0.7.ebuild 4163
-SHA256 451a955d927928a68400e6d320ced315b1597cc56a91d474aa3032ba910db259 openvpn-2.0.7.ebuild 4163
+EBUILD openvpn-2.0.6.ebuild 4093 RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 SHA1 e48a9042fa4c12e80e37bc25d58e957853e30037 SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b
+MD5 9ec0d85641d0511f4096473e72035437 openvpn-2.0.6.ebuild 4093
+RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 openvpn-2.0.6.ebuild 4093
+SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b openvpn-2.0.6.ebuild 4093
+EBUILD openvpn-2.0.7-r1.ebuild 4209 RMD160 dae508905336b70cece9a98c6e63a51fac5b2f06 SHA1 4594b8a1b3348a5fd861d958c122fd36d083ce29 SHA256 2283f0b3a1013c6fd21341c1861e7faa11fe3ccd98b3e065ac0e417a1039f890
+MD5 15d33e45cf20f59bbea41b1359d03332 openvpn-2.0.7-r1.ebuild 4209
+RMD160 dae508905336b70cece9a98c6e63a51fac5b2f06 openvpn-2.0.7-r1.ebuild 4209
+SHA256 2283f0b3a1013c6fd21341c1861e7faa11fe3ccd98b3e065ac0e417a1039f890 openvpn-2.0.7-r1.ebuild 4209
+EBUILD openvpn-2.0.7-r2.ebuild 4209 RMD160 7cff44d003b838f39fb6428f04e987af318c61e5 SHA1 4e2b363017cd83bb08939757a2d3ae0bc8290532 SHA256 bd2dde4bea648850a10e1099cbdaa1bcfdd2b9fa7c5efad09c3a84d8620bdde5
+MD5 bf6061dcb0a385d7f8e12fef54c8fa85 openvpn-2.0.7-r2.ebuild 4209
+RMD160 7cff44d003b838f39fb6428f04e987af318c61e5 openvpn-2.0.7-r2.ebuild 4209
+SHA256 bd2dde4bea648850a10e1099cbdaa1bcfdd2b9fa7c5efad09c3a84d8620bdde5 openvpn-2.0.7-r2.ebuild 4209
+EBUILD openvpn-2.0.7.ebuild 4162 RMD160 cf115158028fb2e731850ef5d2891172ab8e59a1 SHA1 50a27a08d5f35a600e969db20929d11c67f35627 SHA256 42a63dd518d1ec54f8cb62e667520d046234d4d762c1114781c93753f709c0c9
+MD5 dc9f1b96eff9f49eb2148060cf889bd1 openvpn-2.0.7.ebuild 4162
+RMD160 cf115158028fb2e731850ef5d2891172ab8e59a1 openvpn-2.0.7.ebuild 4162
+SHA256 42a63dd518d1ec54f8cb62e667520d046234d4d762c1114781c93753f709c0c9 openvpn-2.0.7.ebuild 4162
 EBUILD openvpn-2.1_rc1-r1.ebuild 4721 RMD160 d28f62993516c6f3960b3c186fa17f3c9df09e74 SHA1 b08a9f3310f2e9cd4eff19c8e9c98833894cabb1 SHA256 4579e0f5eca9a7083978b5ac11aa64578f5da38829715c6d85506cf3e0e09e97
 MD5 1d3ea21bf9f0a0c1a78237d6e8b310a5 openvpn-2.1_rc1-r1.ebuild 4721
 RMD160 d28f62993516c6f3960b3c186fa17f3c9df09e74 openvpn-2.1_rc1-r1.ebuild 4721
@@ -62,14 +66,14 @@ EBUILD openvpn-2.1_rc1.ebuild 4674 RMD160 74cc582adcc8f01839d7f19fba29e936ed1887
 MD5 46b837bceccbff3ba38def30957c1d07 openvpn-2.1_rc1.ebuild 4674
 RMD160 74cc582adcc8f01839d7f19fba29e936ed18873e openvpn-2.1_rc1.ebuild 4674
 SHA256 1a4548212c003c3784fe8ca1c0ad5f9d76e91b819b63aeda1606f62c9a6f9cbe openvpn-2.1_rc1.ebuild 4674
-EBUILD openvpn-2.1_rc2.ebuild 4628 RMD160 7470b17c8b24129317d4184e23de3b794ea00221 SHA1 d49c8763aaa8b0ca15d4a587007fb80c729b8e74 SHA256 7aecfedadb6d1e680097f6587e22d79ffe214666f81a9bacf6a2a3f5c619f507
-MD5 6fcca55edca4f638f13d6944224cb456 openvpn-2.1_rc2.ebuild 4628
-RMD160 7470b17c8b24129317d4184e23de3b794ea00221 openvpn-2.1_rc2.ebuild 4628
-SHA256 7aecfedadb6d1e680097f6587e22d79ffe214666f81a9bacf6a2a3f5c619f507 openvpn-2.1_rc2.ebuild 4628
-MISC ChangeLog 16769 RMD160 653174e6f58102cab5255e43bbd50a6db521bfff SHA1 363ef48568eb0db7290de4236257a85d0d9ca57b SHA256 ab63415b964b27203e9b9a248e797efc702bf14407ba274465e1e3cce2bc556e
-MD5 872a847810dfbff63fd264ee6f777b36 ChangeLog 16769
-RMD160 653174e6f58102cab5255e43bbd50a6db521bfff ChangeLog 16769
-SHA256 ab63415b964b27203e9b9a248e797efc702bf14407ba274465e1e3cce2bc556e ChangeLog 16769
+EBUILD openvpn-2.1_rc2.ebuild 4692 RMD160 5b1ba9956e1682ce95e80fba38aacca68f3dc66d SHA1 f58ad83c7c72a87e7f8489fe6d6ccb800cbac13b SHA256 6fd7015b2d8bee4387d954b1109d4f05e055611160405667bb594f78602b8a47
+MD5 0a49a6e392de2a212454d7c2b1df8644 openvpn-2.1_rc2.ebuild 4692
+RMD160 5b1ba9956e1682ce95e80fba38aacca68f3dc66d openvpn-2.1_rc2.ebuild 4692
+SHA256 6fd7015b2d8bee4387d954b1109d4f05e055611160405667bb594f78602b8a47 openvpn-2.1_rc2.ebuild 4692
+MISC ChangeLog 17130 RMD160 e828d2104949cfe281dfe09521c70b66c4be9914 SHA1 692afa769fe5d579a8338d62e9209bc077a4602d SHA256 07d345663a15596e2c80e3534d68271488c574339e6df236231ef9b9888a2236
+MD5 465f08e18ab29a34436b85ff1b83b184 ChangeLog 17130
+RMD160 e828d2104949cfe281dfe09521c70b66c4be9914 ChangeLog 17130
+SHA256 07d345663a15596e2c80e3534d68271488c574339e6df236231ef9b9888a2236 ChangeLog 17130
 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6
 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440
 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440

diff --git a/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch b/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch
new file mode 100644 (file)
index 0000000..e6bdcd7
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch
@@ -0,0 +1,66 @@
+diff -ur openvpn-2.1_rc2.orig/configure.ac openvpn-2.1_rc2/configure.ac
+--- openvpn-2.1_rc2.orig/configure.ac  2007-02-28 07:34:32 +0000
++++ openvpn-2.1_rc2/configure.ac       2007-03-05 11:17:24 +0000
+@@ -284,12 +284,44 @@
+                sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl
+                stdarg.h unistd.h signal.h stdio.h string.h dnl
+                strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl
+-               net/if_tun.h net/if.h stropts.h sys/sockio.h dnl
+-               netinet/in.h netinet/in_systm.h netinet/ip.h dnl
+-               netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl
++               net/if_tun.h stropts.h sys/sockio.h dnl
++               netinet/in.h netinet/in_systm.h dnl
++               netinet/tcp.h arpa/inet.h dnl
+                netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl
+                linux/types.h sys/poll.h sys/epoll.h err.h dnl
+ )
++AC_CHECK_HEADERS(net/if.h,,,
++               [#ifdef HAVE_SYS_SOCKET_H 
++                # include <sys/socket.h>
++                #endif
++               ])
++AC_CHECK_HEADERS(netinet/ip.h,,,
++               [#ifdef HAVE_SYS_TYPES_H
++                # include <sys/types.h>
++                #endif
++                #ifdef HAVE_NETINET_IN_H
++                # include <netinet/in.h>
++                #endif
++                #ifdef HAVE_NETINET_IN_SYSTM_H
++                # include <netinet/in_systm.h>
++                #endif
++               ])
++AC_CHECK_HEADERS(netinet/if_ether.h,,,
++               [#ifdef HAVE_SYS_TYPES_H
++                # include <sys/types.h>
++                #endif
++                #ifdef HAVE_SYS_SOCKET_H
++                # include <sys/socket.h>
++                #endif
++                #ifdef HAVE_NETINET_IN_H
++                # include <netinet/in.h>
++                #endif
++               ])
++AC_CHECK_HEADERS(resolv.h,,,
++               [#ifdef HAVE_NETINET_IN_H 
++                # include <netinet/in.h>
++                #endif
++               ])
+ AC_CHECK_HEADERS(linux/errqueue.h,,,
+       [#ifdef HAVE_LINUX_TYPES_H
+        # include <linux/types.h>
+diff -ur openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile openvpn-2.1_rc2/easy-rsa/2.0/Makefile
+--- openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile 2006-10-15 23:30:18 +0100
++++ openvpn-2.1_rc2/easy-rsa/2.0/Makefile      2007-03-05 11:17:29 +0000
+@@ -7,7 +7,7 @@
+       echo "Run make install DESTDIR=/usr/share/somewhere"
+ 
+ install:
+-      install -c --directory "${DESTDIR}/${PREFIX}"
+-      install -c --mode=0755 build-* "${DESTDIR}/${PREFIX}"
+-      install -c --mode=0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
+-      install -c --mode=0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"
++      install -d "${DESTDIR}/${PREFIX}"
++      install -m 0755 build-* "${DESTDIR}/${PREFIX}"
++      install -m 0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
++      install -m 0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"

diff --git a/net-misc/openvpn/openvpn-2.0.6.ebuild b/net-misc/openvpn/openvpn-2.0.6.ebuild
index 71556c813d6a592cb462b0768d14446da1ff0c49..d300ed5f8d68f53b781154ede5bc1b219cf0b58c 100644 (file)
--- a/net-misc/openvpn/openvpn-2.0.6.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.6.ebuild,v 1.14 2007/01/05 09:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.6.ebuild,v 1.15 2007/04/16 11:43:26 uberlord Exp $
 
 inherit eutils multilib
 
@@ -53,7 +53,7 @@ src_compile() {
                $(use_enable threads pthread) \
                || die "configure failed"
 
-       use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+       use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
 
        emake || die "make failed"
 

diff --git a/net-misc/openvpn/openvpn-2.0.7-r1.ebuild b/net-misc/openvpn/openvpn-2.0.7-r1.ebuild
index ebed95f4e56656d2be62c76fee70089c3ddf64b0..532bde45ec330375ffd215669898dad693e7d5d2 100644 (file)
--- a/net-misc/openvpn/openvpn-2.0.7-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r1.ebuild,v 1.3 2007/01/05 09:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r1.ebuild,v 1.4 2007/04/16 11:43:26 uberlord Exp $
 
 inherit eutils multilib
 
@@ -57,7 +57,7 @@ src_compile() {
                $(use_enable threads pthread) \
                || die "configure failed"
 
-       use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+       use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
 
        emake || die "make failed"
 

diff --git a/net-misc/openvpn/openvpn-2.0.7-r2.ebuild b/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
index 9a0be59b520fd6d2f817b3fbc2c0773008ecb52a..36777923c061d4aea2195741062e8a2380b2ba7d 100644 (file)
--- a/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r2.ebuild,v 1.1 2007/02/23 11:44:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r2.ebuild,v 1.2 2007/04/16 11:43:26 uberlord Exp $
 
 inherit eutils multilib
 
@@ -57,7 +57,7 @@ src_compile() {
                $(use_enable threads pthread) \
                || die "configure failed"
 
-       use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+       use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
 
        emake || die "make failed"
 

diff --git a/net-misc/openvpn/openvpn-2.0.7.ebuild b/net-misc/openvpn/openvpn-2.0.7.ebuild
index c23397e9b14daa295cf93e69445f3679ade06118..fda2959a69153afebf73b57effae0afca133a92f 100644 (file)
--- a/net-misc/openvpn/openvpn-2.0.7.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7.ebuild,v 1.6 2007/01/05 09:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7.ebuild,v 1.7 2007/04/16 11:43:26 uberlord Exp $
 
 inherit eutils multilib
 
@@ -56,7 +56,7 @@ src_compile() {
                $(use_enable threads pthread) \
                || die "configure failed"
 
-       use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+       use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
 
        emake || die "make failed"
 

diff --git a/net-misc/openvpn/openvpn-2.1_rc2.ebuild b/net-misc/openvpn/openvpn-2.1_rc2.ebuild
index 4c4660ccd93305c1d7605630084a06a92a8c59bd..c7b1117b9671fb82e9c83f48ed52312f27eaad68 100644 (file)
--- a/net-misc/openvpn/openvpn-2.1_rc2.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc2.ebuild,v 1.1 2007/03/04 16:28:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc2.ebuild,v 1.2 2007/04/16 11:43:26 uberlord Exp $
 
-inherit eutils multilib
+inherit autotools eutils multilib
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
@@ -36,6 +36,8 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
+       epatch "${FILESDIR}/${P}"-freebsd.patch
+       eautoreconf
 }
 
 src_compile() {
@@ -55,7 +57,7 @@ src_compile() {
                $(use_enable threads pthread) \
                || die "configure failed"
 
-       use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+       use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
 
        emake || die "make failed"