Build with user specified CFLAGS (#240878).

(Portage version: 2.1.4.4, RepoMan options: --force)

3 files changed, 93 insertions, 1 deletions

diff --git a/net-dialup/mwavem/ChangeLog b/net-dialup/mwavem/ChangeLog
index a6e4dabdbdd2..2ab1d5b449a0 100644
--- a/net-dialup/mwavem/ChangeLog
+++ b/net-dialup/mwavem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/mwavem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.13 2008/05/19 19:52:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.14 2008/10/18 09:42:16 mrness Exp $
+
+*mwavem-2.0-r1 (18 Oct 2008)
+
+  18 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/mwavem-2.0-gentoo.patch, +mwavem-2.0-r1.ebuild:
+  Build with user specified CFLAGS (#240878).
 
   19 May 2008; Alin Năstac <mrness@gentoo.org> mwavem-2.0.ebuild:
   Use udevcontrol to reload udev rules (#220665).
diff --git a/net-dialup/mwavem/files/mwavem-2.0-gentoo.patch b/net-dialup/mwavem/files/mwavem-2.0-gentoo.patch
new file mode 100644
index 000000000000..ca86b5039444
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-gentoo.patch
@@ -0,0 +1,24 @@
+diff -ur mwavem-2.0.orig/configure.in mwavem-2.0/configure.in
+--- mwavem-2.0.orig/configure.in	2004-04-06 23:50:57.000000000 +0000
++++ mwavem-2.0/configure.in	2008-10-18 09:31:29.000000000 +0000
+@@ -27,7 +27,7 @@
+ AC_DEFINE(MWWTDBG)
+ 
+ INCLUDES="-I\$(top_srcdir)/src/include"
+-CFLAGS="$INCLUDES -O2 -fno-strict-aliasing -fomit-frame-pointer -Wall"
++CFLAGS="${CFLAGS} $INCLUDES -fno-strict-aliasing -Wall"
+ 
+ dnl Set dsp_dir here and we substitute it in mwavem.conf from mwavem.conf.in
+ dsp_dir=`	test "x$exec_prefix" = xNONE && exec_prefix=$ac_default_prefix
+diff -ur mwavem-2.0.orig/src/mwavem/Makefile.am mwavem-2.0/src/mwavem/Makefile.am
+--- mwavem-2.0.orig/src/mwavem/Makefile.am	2008-10-18 09:38:52.000000000 +0000
++++ mwavem-2.0/src/mwavem/Makefile.am	2008-10-18 09:38:00.000000000 +0000
+@@ -10,6 +10,8 @@
+ 	-rm $(distdir)/modem.c
+ 
+ install-exec-local:
++
++install-exec-local-invalid:
+ 	if [ ! -c "/dev/modems/mwave" ]; then \
+ 		mkdir -p /dev/modems; \
+ 		mknod --mode=660 /dev/modems/mwave c 10 219; \
diff --git a/net-dialup/mwavem/mwavem-2.0-r1.ebuild b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
new file mode 100644
index 000000000000..5910b994f41f
--- /dev/null
+++ b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0-r1.ebuild,v 1.1 2008/10/18 09:42:16 mrness Exp $
+
+inherit autotools
+
+DESCRIPTION="User level application for IBM Mwave modem"
+HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
+SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mwave-dev-handler"
+
+	insinto /etc/devfs.d
+	newins "${FILESDIR}/mwave.devfs" mwave
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/mwave.modules" mwave
+
+	dodoc AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS
+	docinto doc
+	dodoc doc/mwave.sgml doc/mwave.txt
+	dohtml doc/mwave.html
+}
+
+pkg_postinst() {
+	# Below is to get /etc/modules.d/mwave loaded into /etc/modules.conf
+	if [ "$ROOT" = "/" ]; then
+		[ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
+	fi
+
+	if [ -e "${ROOT}/dev/.devfsd" ]; then
+		# device node is created by devfs
+		ebegin "Restarting devfsd to reread devfs rules"
+			killall -HUP devfsd
+		eend $?
+	elif [ -e "${ROOT}/dev/.udev" ]; then
+		#the device should be created by udev
+		ebegin "Restarting udev to reread udev rules"
+			udevcontrol reload_rules
+		eend $?
+	else
+		[ ! -d "${ROOT}/dev/modem" ] && mkdir --mode=0755 "${ROOT}/dev/modems"
+		mknod --mode=0660 "${ROOT}/dev/modems/mwave" c 10 219
+	fi
+}