Fix makefile thanks to kingtong in bug 116165

(Portage version: 2.1.2.3)

4 files changed, 13 insertions, 181 deletions

diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog
index 9451cc150123..693a66bb1fe1 100644
--- a/net-misc/ser/ChangeLog
+++ b/net-misc/ser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ser
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.25 2006/12/06 10:43:13 drizzt Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.26 2007/04/14 10:35:54 genstef Exp $
+
+  14 Apr 2007; Stefan Schweizer <genstef@gentoo.org> -ser-0.9.0.ebuild,
+  ser-0.9.4.ebuild:
+  Fix makefile thanks to kingtong in bug 116165
 
   06 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> ser-0.9.6.ebuild:
   Remove -minline-all-stringops from sparc64, this fix bug #157109.
diff --git a/net-misc/ser/files/digest-ser-0.9.0 b/net-misc/ser/files/digest-ser-0.9.0
deleted file mode 100644
index 0ce898721131..000000000000
--- a/net-misc/ser/files/digest-ser-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 72ab86bde9715f4f712c5b6fb8909dd0 ethz-1.0-ser-0.9.0.tar.gz 5266
-RMD160 fe7bf58ecde23af103f6dba9571e2278d5415406 ethz-1.0-ser-0.9.0.tar.gz 5266
-SHA256 0d019caf9e19a51387f95dd511c1930ca8b521a8e9df4fdc042caa8678c371ea ethz-1.0-ser-0.9.0.tar.gz 5266
-MD5 f5741e12d060323eed40f1af978a1310 ldap-1.0-ser-0.9.0.tar.gz 5069
-RMD160 346b50b309f5e172d9cc71a526c6179b414f9825 ldap-1.0-ser-0.9.0.tar.gz 5069
-SHA256 244817715cf26411820a45c5197346fe4d39407f64b2d05d81bfcf4117ca02b2 ldap-1.0-ser-0.9.0.tar.gz 5069
-MD5 b5500e4b2156eed20df1284e85190ae4 ldaps-1.0-ser-0.9.0.tar.gz 5051
-RMD160 e31495405b518107a57a34b0e771188a6a1712c7 ldaps-1.0-ser-0.9.0.tar.gz 5051
-SHA256 83e8e54423969dc72a71c71a22c59d4a1e4fe29aa1b886e68acf98d45a8c5126 ldaps-1.0-ser-0.9.0.tar.gz 5051
-MD5 ae1f9b237f0006785ff22eafa1470ac4 ser-0.9.0_src.tar.gz 1853730
-RMD160 32ff4a77b4c3182d185422e31ac3026182d016d4 ser-0.9.0_src.tar.gz 1853730
-SHA256 65eb4c5735859f3ed191437749a85e9fd24a66a6567025f36a0739f9c34c444e ser-0.9.0_src.tar.gz 1853730
-MD5 4acc4f68df2894da79cbc4d697f22c8f silomail-1.0-ser-0.9.0.tar.gz 4762
-RMD160 999d127a3ebad42cb207e2d2519e485588595f9a silomail-1.0-ser-0.9.0.tar.gz 4762
-SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826 silomail-1.0-ser-0.9.0.tar.gz 4762
diff --git a/net-misc/ser/ser-0.9.0.ebuild b/net-misc/ser/ser-0.9.0.ebuild
deleted file mode 100644
index 8e5b736e9ded..000000000000
--- a/net-misc/ser/ser-0.9.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.0.ebuild,v 1.11 2006/11/23 20:38:59 vivo Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="ipv6 mysql radius postgres jabber ldap ssl"
-
-ETHZ_PV="1.0"
-LDAP_PV="1.0"
-LDAPS_PV="1.0"
-SILOMAIL_PV="1.0"
-
-DESCRIPTION="SIP Express Router"
-HOMEPAGE="http://www.iptel.org/ser"
-SRC_URI="ftp://ftp.berlios.de/pub/ser/${PV}/src/${P}_src.tar.gz
-	 mirror://gentoo/silomail-${SILOMAIL_PV}-${P}.tar.gz
-	 mirror://gentoo/ethz-${ETHZ_PV}-${P}.tar.gz
-	 ldap? ( mirror://gentoo/ldap-${LDAP_PV}-${P}.tar.gz
-		 mirror://gentoo/ldaps-${LDAPS_PV}-${P}.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc x86"
-
-RDEPEND="
-	mysql? ( virtual/mysql )
-	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
-	postgres? ( dev-db/postgresql )
-	jabber? ( dev-libs/expat )
-	ldap? (
-		net-nds/openldap
-		ssl? ( dev-libs/openssl )
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.35
-	>=sys-devel/flex-2.5.4a"
-
-pkg_setup() {
-	enewgroup ser
-	enewuser  ser -1 -1 /dev/null ser
-}
-
-src_unpack() {
-	local modules extmodules MY_A
-
-	# unpack ser source
-	unpack ${P}_src.tar.gz
-
-	cd ${S}
-	use ipv6 || \
-		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs
-
-	# external modules
-	extmodules="silomail ethz"
-
-	use mysql && \
-		modules="${modules} mysql"
-
-	use radius && \
-		modules="${modules} auth_radius group_radius uri_radius avp_radius"
-
-	use jabber && \
-		modules="${modules} jabber"
-
-	use postgres && \
-		modules="${modules} postgres"
-
-	use ldap && \
-		extmodules="${extmodules} ldap"
-
-	use ldap && use ssl && \
-		extmodules="${extmodules} ldaps"
-
-	# put list of modules into Makefile, we need the list
-	# during compile and install phase...
-	sed -i -e "s:^\(include_modules.*\):\1 ${modules} ${extmodules}:" \
-		Makefile
-
-	# fix ser.cfg
-	sed -i -e "/force_send_socket(smaug:5080);/ d" \
-		etc/ser.cfg
-
-	# unpack external modules
-	# ugly i know...
-	for x in ${extmodules}; do
-		MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${P})
-		mkdir -p ${S}/modules/${x}
-		cd ${S}/modules/${x}
-		unpack ${MY_A}.tar.gz
-		# fix makefiles
-		if [[ -f ${FILESDIR}/${MY_A}.diff ]]; then
-			epatch ${FILESDIR}/${MY_A}.diff
-		fi
-	done
-
-	# remove sasl if openldap hasn't been built with it
-	if use ldap && ! built_with_use net-nds/openldap sasl; then
-		sed -i -e "s:-lsasl::g" \
-			${S}/modules/ldap/Makefile
-
-		if use ssl; then
-			sed -i -e "s:-lsasl::g" \
-				${S}/modules/ldaps/Makefile
-		fi
-	fi
-}
-
-src_compile() {
-	# add -fPIC
-	append-flags -fPIC
-
-	make all \
-		CFLAGS="${CFLAGS}" \
-		cfg-prefix=/ \
-		cfg-target=/etc/ser/ \
-		${myconf} || die
-}
-
-src_install () {
-	make install \
-		prefix="" \
-		bin-prefix=${D}/usr/sbin \
-		bin-dir="" \
-		cfg-prefix=${D}/etc \
-		cfg-dir=ser/ \
-		cfg-target=/etc/ser/ \
-		modules-prefix=${D}/usr/lib/ser \
-		modules-dir=modules \
-		modules-target=/usr/lib/ser/modules/ \
-		man-prefix=${D}/usr/share/man \
-		man-dir="" \
-		doc-prefix=${D}/usr/share/doc \
-		doc-dir=${P} || die
-
-	newinitd ${FILESDIR}/ser.rc6 ser
-	newconfd ${FILESDIR}/ser.confd ser
-	exeinto /usr/sbin
-	newexe scripts/harv_ser.sh harv_ser.sh
-	newexe scripts/sc serctl
-	newexe scripts/ser_mysql.sh ser_mysql.sh
-
-	chown -R root:ser ${D}/etc/ser
-	chmod 750 ${D}/etc/ser
-	chmod 640 ${D}/etc/ser/*
-
-	# fix manpages
-	sed -i	-e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \
-		-e "s:^.B /ser:.B /usr/sbin/ser:" \
-		${D}/usr/share/man/*/*
-}
-
-pkg_postinst() {
-	if has_version ${CATEGORY}/${PN}; then
-		einfo "Changing permissions on ${ROOT}etc/ser"
-
-		chown -R root:ser ${ROOT}/etc/ser
-		chmod 750 ${ROOT}/etc/ser
-		chmod 640 ${ROOT}/etc/ser/*
-	fi
-}
diff --git a/net-misc/ser/ser-0.9.4.ebuild b/net-misc/ser/ser-0.9.4.ebuild
index 6d092e9c59c1..3948441e9a42 100644
--- a/net-misc/ser/ser-0.9.4.ebuild
+++ b/net-misc/ser/ser-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.5 2006/11/23 20:38:59 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.6 2007/04/14 10:35:54 genstef Exp $
 
 inherit eutils flag-o-matic
 
@@ -95,6 +95,11 @@ src_unpack() {
 		fi
 	done
 
+	if use mysql || use postgres; then
+		sed -i -e "s:^#DEFS+=-DSQL_ACC$:DEFS+=-DSQL_ACC:" \
+			${S}/modules/acc/Makefile
+	fi
+
 	# remove sasl if openldap hasn't been built with it
 	if use ldap && ! built_with_use net-nds/openldap sasl; then
 		sed -i -e "s:-lsasl::g" \