11 files changed, 61 insertions, 165 deletions
diff --git a/net-mail/freepops/ChangeLog b/net-mail/freepops/ChangeLog
index 363ec5393f7b..420ebcd9eadd 100644
--- a/net-mail/freepops/ChangeLog
+++ b/net-mail/freepops/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/freepops
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.29 2007/05/10 21:42:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/ChangeLog,v 1.30 2007/05/19 00:47:18 dragonheart Exp $
+
+*freepops-0.2.3 (19 May 2007)
+
+  19 May 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/freepops-0.2.3-pop3config.diff, -freepops-0.0.99.ebuild,
+  -freepops-0.0.99-r1.ebuild, -freepops-0.2.0.ebuild,
+  -freepops-0.2.2.ebuild, +freepops-0.2.3.ebuild:
+  version bump + a little tree cleaning
 
 *freepops-0.2.2-r1 (10 May 2007)
 
diff --git a/net-mail/freepops/files/digest-freepops-0.0.99 b/net-mail/freepops/files/digest-freepops-0.0.99
deleted file mode 100644
index 109be8e4bf90..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.99
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8840fb6b3d4d0916bcddde926d068e4e freepops-0.0.99.tar.gz 2092051
-RMD160 6288029b6fef1e3d635ec64e14c6b0e8b08100e8 freepops-0.0.99.tar.gz 2092051
-SHA256 a4a10ffe46b5cf98ac43521ad16e06540ac007eccebc8c3974e224f14c52eb04 freepops-0.0.99.tar.gz 2092051
diff --git a/net-mail/freepops/files/digest-freepops-0.0.99-r1 b/net-mail/freepops/files/digest-freepops-0.0.99-r1
deleted file mode 100644
index 7d4df6f1566f..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.0.99-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8840fb6b3d4d0916bcddde926d068e4e freepops-0.0.99.tar.gz 2092051
-RMD160 6288029b6fef1e3d635ec64e14c6b0e8b08100e8 freepops-0.0.99.tar.gz 2092051
-SHA256 a4a10ffe46b5cf98ac43521ad16e06540ac007eccebc8c3974e224f14c52eb04 freepops-0.0.99.tar.gz 2092051
-MD5 0db10447aecacd5535c8094e83187fb6 freepops-0.0.99_updates_20070127.patch.bz2 16713
-RMD160 e96aa52619e8bb73e0e611456890d9dfd6cb9aca freepops-0.0.99_updates_20070127.patch.bz2 16713
-SHA256 5bd1be6b4764f33cd0778a7c787486f113e25e41cc233581aac99314d2b82dd9 freepops-0.0.99_updates_20070127.patch.bz2 16713
diff --git a/net-mail/freepops/files/digest-freepops-0.2.0 b/net-mail/freepops/files/digest-freepops-0.2.0
deleted file mode 100644
index ac35d94b5320..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b91472f67a8c2b2cc855fd8ae1988577 freepops-0.2.0.tar.gz 1782970
-RMD160 7291e7e8166baab92bd7480d6ba8e0f40c14a84e freepops-0.2.0.tar.gz 1782970
-SHA256 4e24595050efad0c5df40cb9286e8fea8aabfbeeca6cf7d6387f23ac8b60db5d freepops-0.2.0.tar.gz 1782970
diff --git a/net-mail/freepops/files/digest-freepops-0.2.2 b/net-mail/freepops/files/digest-freepops-0.2.2
deleted file mode 100644
index 68bb6e242d42..000000000000
--- a/net-mail/freepops/files/digest-freepops-0.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8cd34d36523751d1b64c9bf471366925 freepops-0.2.2.tar.gz 1796281
-RMD160 ce0df112cd967f10746a5d9010d551f4bb8b66d9 freepops-0.2.2.tar.gz 1796281
-SHA256 bc74f03c548f5d7f23dcc49a51b9ab384783c5378d356bf942e9eb7109f88dc0 freepops-0.2.2.tar.gz 1796281
diff --git a/net-mail/freepops/files/digest-freepops-0.2.3 b/net-mail/freepops/files/digest-freepops-0.2.3
new file mode 100644
index 000000000000..341ae46a5e4e
--- /dev/null
+++ b/net-mail/freepops/files/digest-freepops-0.2.3
@@ -0,0 +1,3 @@
+MD5 963f97f623d8cd38fd5ef869e8c330de freepops-0.2.3.tar.gz 1885970
+RMD160 c1c96d65f76ab8814e3d9d0184bdc11fb11f73de freepops-0.2.3.tar.gz 1885970
+SHA256 1a1330de998121892c9f7a420c0b76b0b6c95899d68ffc5aa42370de36fd52d9 freepops-0.2.3.tar.gz 1885970
diff --git a/net-mail/freepops/files/freepops-0.2.3-pop3config.diff b/net-mail/freepops/files/freepops-0.2.3-pop3config.diff
new file mode 100644
index 000000000000..d6a06cf2033b
--- /dev/null
+++ b/net-mail/freepops/files/freepops-0.2.3-pop3config.diff
@@ -0,0 +1,39 @@
+--- modules/src/pop3server/popserver.c.orig	2007-05-19 09:49:10.000000000 +1000
++++ modules/src/pop3server/popserver.c	2007-05-19 09:49:25.000000000 +1000
+@@ -34,9 +34,7 @@
+ #include "popstate.h"
+ #include "threads.h"
+ 
+-#ifdef HAVE_CONFIG_H
+-	#include "config.h"
+-#endif
++#include "config.h"
+ 
+ #include "log.h"
+ #define LOG_ZONE "POPSERVER"
+--- ./src/engine.c.orig	2007-05-19 09:53:52.000000000 +1000
++++ ./src/engine.c	2007-05-19 09:54:16.000000000 +1000
+@@ -17,9 +17,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+  
+-#ifdef HAVE_CONFIG_H
+-#	include "config.h"
+-#endif
++#include "config.h"
+ 
+ #include "popserver.h"
+ #include "popstate.h"
+--- ./src/freepops.c.orig	2007-05-19 09:56:20.000000000 +1000
++++ ./src/freepops.c	2007-05-19 09:56:38.000000000 +1000
+@@ -47,9 +47,7 @@
+ 	#include <getopt.h>
+ #endif
+ 
+-#ifdef HAVE_CONFIG_H
+-#      include "config.h"
+-#endif
++#include "config.h"
+ 
+ #if CRYPTO_IMPLEMENTATION == 1
+ 	#include <pthread.h>
diff --git a/net-mail/freepops/freepops-0.0.99-r1.ebuild b/net-mail/freepops/freepops-0.0.99-r1.ebuild
deleted file mode 100644
index b4645758ec93..000000000000
--- a/net-mail/freepops/freepops-0.0.99-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.99-r1.ebuild,v 1.1 2007/01/27 04:36:54 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="WebMail->POP3 converter and more"
-HOMEPAGE="http://freepops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz
-	mirror://gentoo/${P}_updates_20070127.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-		<dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}_updates_20070127.patch
-	epatch "${FILESDIR}"/${P}-system-lua.patch
-}
-
-src_compile() {
-	# note fbsd and Darwin and osx targets exist here too
-	if use gnutls; then
-		./configure.sh linux-gnutls || die "configure gnutls failed"
-	else
-		./configure.sh linux || die "configure openssl failed"
-	fi
-	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
-	emake -j1 all || die "make failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	newinitd buildfactory/freePOPsd.initd freepopsd
-	newconfd buildfactory/freePOPsd.confd freepopsd
-}
diff --git a/net-mail/freepops/freepops-0.0.99.ebuild b/net-mail/freepops/freepops-0.0.99.ebuild
deleted file mode 100644
index ff7abc8270a9..000000000000
--- a/net-mail/freepops/freepops-0.0.99.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.0.99.ebuild,v 1.2 2007/01/27 04:36:54 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="WebMail->POP3 converter and more"
-HOMEPAGE="http://freepops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-		<dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.0.97-system-lua.patch"
-}
-
-src_compile() {
-	# note fbsd and Darwin and osx targets exist here too
-	if use gnutls; then
-		./configure.sh linux-gnutls || die "configure gnutls failed"
-	else
-		./configure.sh linux || die "configure openssl failed"
-	fi
-	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
-	emake -j1 all || die "make failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	newinitd buildfactory/freePOPsd.initd freepopsd
-	newconfd buildfactory/freePOPsd.confd freepopsd
-}
diff --git a/net-mail/freepops/freepops-0.2.0.ebuild b/net-mail/freepops/freepops-0.2.0.ebuild
deleted file mode 100644
index bcd7d7353ebf..000000000000
--- a/net-mail/freepops/freepops-0.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.2.0.ebuild,v 1.1 2007/03/05 12:31:44 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="WebMail->POP3 converter and more"
-HOMEPAGE="http://freepops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepops/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=net-misc/curl-7.10.8
-		gnutls? ( net-libs/gnutls
-					dev-libs/libgcrypt )
-		!gnutls? ( dev-libs/openssl )
-		>=dev-lang/lua-5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/pkg-config lua/s/5.1//g' configure.sh
-}
-
-src_compile() {
-	# note fbsd and Darwin and osx targets exist here too
-	if use gnutls; then
-		./configure.sh linux-gnutls -lua || die "configure gnutls failed"
-		sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
-	else
-		./configure.sh linux-slack -lua || die "configure openssl failed"
-	fi
-	emake -j1 all || die "make failed"
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}" || die
-	dodoc AUTHORS README ChangeLog TODO \
-		"${D}"/usr/share/doc/${PN}/*
-	rm -rf "${D}"/usr/share/doc/${PN}
-	chmod a+x "${D}"/usr/bin/freepops-updater-dialog
-
-	newinitd buildfactory/freePOPsd.initd freepopsd
-	newconfd buildfactory/freePOPsd.confd freepopsd
-}
diff --git a/net-mail/freepops/freepops-0.2.2.ebuild b/net-mail/freepops/freepops-0.2.3.ebuild
index 027a9c1076fb..7e93e7caca4e 100644
--- a/net-mail/freepops/freepops-0.2.2.ebuild
+++ b/net-mail/freepops/freepops-0.2.3.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-mail/freepops/freepops-0.2.2.ebuild,v 1.1 2007/04/19 10:26:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/freepops/freepops-0.2.3.ebuild,v 1.1 2007/05/19 00:47:18 dragonheart Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="WebMail->POP3 converter and more"
 HOMEPAGE="http://freepops.sourceforge.net/"
@@ -23,22 +23,25 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e '/pkg-config lua/s/5.1//g' configure.sh
+	sed -i -e '/PKGCONFIG lua/s/5.1//g' configure.sh
+	epatch "${FILESDIR}"/${P}-pop3config.diff
 }
 
 src_compile() {
+	tc-export CC CXX LD AR STRIP RANLIB
 	# note fbsd and Darwin and osx targets exist here too
 	if use gnutls; then
 		./configure.sh linux-gnutls -lua || die "configure gnutls failed"
-		sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
 	else
-		./configure.sh linux-slack -lua || die "configure openssl failed"
+		./configure.sh linux -lua || die "configure openssl failed"
 	fi
-	emake -j1 all || die "make failed"
+	sed -i -e '/^WHERE=/s/=.*$/=\/usr\//' config
+	sed -i -e 's:var/lib/:usr/share/:g' config.h Makefile
+	emake -j1 H= all || die "make failed"
 }
 
 src_install() {
-	emake -j2 install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die
 	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF}
 	dodoc AUTHORS README ChangeLog TODO
 	chmod a+x "${D}"/usr/bin/freepops-updater-dialog