4 files changed, 71 insertions, 78 deletions

diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile
index 2ef45d27b727..909a0fb9a6b4 100644
--- a/mail/freepops/Makefile
+++ b/mail/freepops/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freepops
-PORTVERSION=	0.0.99
-PORTREVISION=	1
+PORTVERSION=	0.2.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freepops
@@ -18,7 +17,7 @@ COMMENT=	Extensible webmail to pop3 interface
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		curl:${PORTSDIR}/ftp/curl
 
-MAN1=		freepopsd.1
+MAN1=		freepopsd.1 freepops-updater-dialog.1 freepops-updater-zenity.1
 
 USE_BISON=	build
 USE_GMAKE=	yes
@@ -29,16 +28,17 @@ CFLAGS+=	-I${OPENSSLBASE}/include ${PTHREAD_CFLAGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|\(WHERE=\)/usr/local|\1${PREFIX}|; \
-		 s|^#!/bin/bash|#!/bin/sh|; \
+		's|^#!/bin/bash|#!/bin/sh|; \
+		 s|\(WHERE=\)/usr/local|\1${PREFIX}|; \
 		 s|/usr/local|${LOCALBASE}|; \
-		 s|^CC=gcc||; \
-		 s|-O2 -g3 -march=i486|${CFLAGS}|' \
+		 s|^CC=$${CC:-gcc}||; \
+		 s|^CXX=$${CXX:-g++}||; \
+		 s|=$${CFLAGS:-"-O2 -g3 \(.*\)"}|="$${CFLAGS} \1"|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e \
 		's|$$(PREFIX)|${PREFIX}/|; \
 		 s|share/\(man/man1\)|\1|; \
-		 s|$$(DESTDIR)\(/etc/freepops\)|${PREFIX}\1|; \
+		 s|$$(DESTDIR)\(etc/freepops\)|${PREFIX}/\1|; \
 		 s|\(cp config\.lua\) .*|\1 ${PREFIX}/etc/freepops/config.lua.sample|; \
 		 s|for D in modules/include/\*/;|for D in modules/include/*;|' \
 		${WRKSRC}/Makefile
@@ -46,9 +46,6 @@ post-patch:
 		's|-pthread|${PTHREAD_LIBS}|g'\
 		${WRKSRC}/src/Makefile
 	@${REINPLACE_CMD} -e \
-		's|^#!/bin/bash|#!/bin/sh|' \
-		${WRKSRC}/modules/src/curl_lua/find_curl.sh
-	@${REINPLACE_CMD} -e \
 		's|^#CURL_LD_FLAGS|CURL_LD_FLAGS|' \
 		${WRKSRC}/src/Makefile
 
diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo
index be4d5963be0e..61f4b73d2731 100644
--- a/mail/freepops/distinfo
+++ b/mail/freepops/distinfo
@@ -1,3 +1,3 @@
-MD5 (freepops-0.0.99.tar.gz) = 8840fb6b3d4d0916bcddde926d068e4e
-SHA256 (freepops-0.0.99.tar.gz) = a4a10ffe46b5cf98ac43521ad16e06540ac007eccebc8c3974e224f14c52eb04
-SIZE (freepops-0.0.99.tar.gz) = 2092051
+MD5 (freepops-0.2.7.tar.gz) = 768e685746b33ff6469d35730667086f
+SHA256 (freepops-0.2.7.tar.gz) = 4cf97069d1f1b10bec896d856d78f2867be8ede10917767e5d813c0c69b6a817
+SIZE (freepops-0.2.7.tar.gz) = 1955240
diff --git a/mail/freepops/files/patch-modules_src_Makefile.template b/mail/freepops/files/patch-modules_src_Makefile.template
deleted file mode 100644
index da301c329fc8..000000000000
--- a/mail/freepops/files/patch-modules_src_Makefile.template
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/src/Makefile.template.orig	Mon Nov 14 20:21:27 2005
-+++ modules/src/Makefile.template	Mon Nov 14 20:21:50 2005
-@@ -77,7 +77,7 @@
- 	
- .%.d:%.c
- 	$(H)echo " building dep for $<"
--	$(H)$(CC) -I. -I$(PREFIX)/include $(CFLAGS) -MM $< > $@;
-+	$(H)$(CC) ${CFLAGS} -MM $< > $@;
- 
- .%.d:%.pkg
- 	$(H)echo " building dep for $<"
diff --git a/mail/freepops/pkg-plist b/mail/freepops/pkg-plist
index 47b88558ae4e..5919c82fea22 100644
--- a/mail/freepops/pkg-plist
+++ b/mail/freepops/pkg-plist
@@ -1,56 +1,63 @@
+bin/freepops-updater-dialog
+bin/freepops-updater-zenity
 bin/freepopsd
-@unexec if cmp -s %D/etc/freepops/config.lua %D/etc/freepops/config.lua.sample; then rm -f %D/etc/freepops/config.lua; fi
+share/doc/freepops/MANUAL.txt
+share/freepops/lua/abv.lua
+share/freepops/lua/aggregator.lua
+share/freepops/lua/aol.lua
+share/freepops/lua/browser/browser.lua
+share/freepops/lua/browser/cookie.lua
+share/freepops/lua/common.lua
+share/freepops/lua/config.lua
+share/freepops/lua/davmail.lua
+share/freepops/lua/excite.lua
+share/freepops/lua/fastmail.lua
+share/freepops/lua/flatnuke.lua
+share/freepops/lua/foo.lua
+share/freepops/lua/freepops.lua
+share/freepops/lua/gmail.lua
+share/freepops/lua/hotmail.lua
+share/freepops/lua/httpmail.lua
+share/freepops/lua/juno.lua
+share/freepops/lua/kernel.lua
+share/freepops/lua/libero.lua
+share/freepops/lua/lxp/lom.lua
+share/freepops/lua/lycos.lua
+share/freepops/lua/mail2world.lua
+share/freepops/lua/mailcom.lua
+share/freepops/lua/mimer.lua
+share/freepops/lua/monitor.lua
+share/freepops/lua/netscape.lua
+share/freepops/lua/orange.lua
+share/freepops/lua/plugins2xml.lua
+share/freepops/lua/popforward.lua
+share/freepops/lua/psock.lua
+share/freepops/lua/serial.lua
+share/freepops/lua/skeleton.lua
+share/freepops/lua/soap/http.lua
+share/freepops/lua/soap/soap.lua
+share/freepops/lua/socket.lua
+share/freepops/lua/softhome.lua
+share/freepops/lua/squirrelmail.lua
+share/freepops/lua/supereva.lua
+share/freepops/lua/support.lua
+share/freepops/lua/table2xml.lua
+share/freepops/lua/tin.lua
+share/freepops/lua/tre.lua
+share/freepops/lua/updater.lua
+share/freepops/lua/updater_common.lua
+share/freepops/lua/updater_php.lua
+share/freepops/lua/version_comparer.lua
+share/freepops/lua/xml2table.lua
+share/freepops/lua/xml2tex.lua
+share/freepops/lua/yahoo.lua
+@dirrm share/freepops/lua/soap
+@dirrm share/freepops/lua/lxp
+@dirrm share/freepops/lua/browser
+@dirrm share/freepops/lua
+@dirrm share/freepops
+@dirrm share/doc/freepops
+@unexec if cmp -s %D/etc/freepops/config.lua.sample %D/etc/freepops/config.lua; then rm -f %D/etc/freepops/config.lua; fi
 etc/freepops/config.lua.sample
-@exec [ -f %B/config.lua ] || cp %B/%f %B/config.lua
-%%DOCSDIR%%/MANUAL.txt
-%%DATADIR%%/lua/aggregator.lua
-%%DATADIR%%/lua/aol.lua
-%%DATADIR%%/lua/browser/browser.lua
-%%DATADIR%%/lua/browser/cookie.lua
-%%DATADIR%%/lua/common.lua
-%%DATADIR%%/lua/compat-5.1.lua
-%%DATADIR%%/lua/config.lua
-%%DATADIR%%/lua/criticalpath.lua
-%%DATADIR%%/lua/davmail.lua
-%%DATADIR%%/lua/fastmail.lua
-%%DATADIR%%/lua/flatnuke.lua
-%%DATADIR%%/lua/foo.lua
-%%DATADIR%%/lua/freepops.lua
-%%DATADIR%%/lua/gmail.lua
-%%DATADIR%%/lua/hotmail.lua
-%%DATADIR%%/lua/httpmail.lua
-%%DATADIR%%/lua/juno.lua
-%%DATADIR%%/lua/kernel.lua
-%%DATADIR%%/lua/libero.lua
-%%DATADIR%%/lua/lxp/lom.lua
-%%DATADIR%%/lua/lycos.lua
-%%DATADIR%%/lua/mail2world.lua
-%%DATADIR%%/lua/mailcom.lua
-%%DATADIR%%/lua/mimer.lua
-%%DATADIR%%/lua/netscape.lua
-%%DATADIR%%/lua/plugins2xml.lua
-%%DATADIR%%/lua/popforward.lua
-%%DATADIR%%/lua/serial.lua
-%%DATADIR%%/lua/skeleton.lua
-%%DATADIR%%/lua/soap/http.lua
-%%DATADIR%%/lua/soap/soap.lua
-%%DATADIR%%/lua/squirrelmail.lua
-%%DATADIR%%/lua/supereva.lua
-%%DATADIR%%/lua/support.lua
-%%DATADIR%%/lua/table2xml.lua
-%%DATADIR%%/lua/tin.lua
-%%DATADIR%%/lua/tre.lua
-%%DATADIR%%/lua/updater.lua
-%%DATADIR%%/lua/version_comparer.lua
-%%DATADIR%%/lua/xml2table.lua
-%%DATADIR%%/lua/xml2tex.lua
-%%DATADIR%%/lua/yahoo.lua
-@dirrmtry %%DATADIR%%/lua_unofficial
-@dirrm %%DATADIR%%/lua/soap
-@dirrm %%DATADIR%%/lua/lxp
-@dirrm %%DATADIR%%/lua/browser
-@dirrm %%DATADIR%%/lua
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+@exec if [ ! -f %D/etc/freepops/config.lua ] ; then cp -p %D/%F %B/config.lua; fi
 @dirrmtry etc/freepops
-@exec mkdir -p %D/share/freepops/lua_unofficial