summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-08-07 03:07:43 +0000
committerMike Frysinger <vapier@gentoo.org>2007-08-07 03:07:43 +0000
commit0046963db820e71c5c3645f86248261cbbd6df39 (patch)
tree4e965f6e24eb670a57a2a8efdf95135c7e3ea8e7 /net-misc/vpnc
parentpkg_postinst(), not pkg_postinstall() (diff)
downloadgentoo-2-0046963db820e71c5c3645f86248261cbbd6df39.tar.gz
gentoo-2-0046963db820e71c5c3645f86248261cbbd6df39.tar.bz2
gentoo-2-0046963db820e71c5c3645f86248261cbbd6df39.zip
Respect CFLAGS/LDFLAGS and dont force -O3.
(Portage version: 2.1.3)
Diffstat (limited to 'net-misc/vpnc')
-rw-r--r--net-misc/vpnc/ChangeLog8
-rw-r--r--net-misc/vpnc/files/vpnc-0.4.0-build.patch17
-rw-r--r--net-misc/vpnc/vpnc-0.4.0-r3.ebuild11
3 files changed, 30 insertions, 6 deletions
diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index bcfdc037a854..e34f8f721f02 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,9 +1,11 @@
# ChangeLog for net-misc/vpnc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.39 2007/08/07 02:58:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.40 2007/08/07 03:07:43 vapier Exp $
- 07 Aug 2007; Mike Frysinger <vapier@gentoo.org> vpnc-0.4.0-r3.ebuild:
- Punt useless src_compile() and fix pkg_postinst() typo.
+ 07 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/vpnc-0.4.0-build.patch, vpnc-0.4.0-r3.ebuild:
+ Punt useless src_compile() and fix pkg_postinst() typo. Respect
+ CFLAGS/LDFLAGS and dont force -O3.
*vpnc-0.4.0-r3 (25 Jul 2007)
diff --git a/net-misc/vpnc/files/vpnc-0.4.0-build.patch b/net-misc/vpnc/files/vpnc-0.4.0-build.patch
new file mode 100644
index 000000000000..af9bddf41fdf
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-0.4.0-build.patch
@@ -0,0 +1,17 @@
+--- Makefile
++++ Makefile
+@@ -34,10 +34,10 @@
+ VERSION := $(shell sh mk-version)
+ RELEASE_VERSION := $(shell cat VERSION)
+
+-CC=gcc
+-CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
+-CPPFLAGS = -DVERSION=\"$(VERSION)\"
+-LDFLAGS = -g $(shell libgcrypt-config --libs)
++CC?=gcc
++CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
++CPPFLAGS += -DVERSION=\"$(VERSION)\"
++LDFLAGS += $(shell libgcrypt-config --libs)
+ CFLAGS += $(shell libgcrypt-config --cflags)
+
+ ifeq ($(shell uname -s), SunOS)
diff --git a/net-misc/vpnc/vpnc-0.4.0-r3.ebuild b/net-misc/vpnc/vpnc-0.4.0-r3.ebuild
index e39b8d0a1275..01cc66f985fe 100644
--- a/net-misc/vpnc/vpnc-0.4.0-r3.ebuild
+++ b/net-misc/vpnc/vpnc-0.4.0-r3.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/vpnc/vpnc-0.4.0-r3.ebuild,v 1.2 2007/08/07 02:58:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.4.0-r3.ebuild,v 1.3 2007/08/07 03:07:43 vapier Exp $
-inherit linux-info
+inherit eutils linux-info
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -12,7 +12,6 @@ LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-S=${WORKDIR}/${P}
DEPEND=">=dev-libs/libgcrypt-1.1.91
>=sys-apps/iproute2-2.6.19.20061214"
@@ -22,6 +21,12 @@ pkg_setup() {
check_extra_config
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
src_install() {
emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
dodoc README TODO VERSION