Update to 0.24b

PR:		ports/90222
Submitted by:	Michael Lednev <liettneff@bk.ru> (maintainer)

4 files changed, 52 insertions, 33 deletions

diff --git a/net/abills/Makefile b/net/abills/Makefile
index 11f086e2e26a..21cc366ad936 100644
--- a/net/abills/Makefile
+++ b/net/abills/Makefile
@@ -6,11 +6,15 @@
 #
 
 PORTNAME=	abills
-PORTVERSION=	0.23b
+PORTVERSION=	0.24b
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	abills
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
+DIST_SUBDIR=	${PORTNAME}
+
+PATCH_SITES=	http://vibrators.ru/abills/
+PATCHFILES=	patches-aa.tar.bz2
 
 MAINTAINER=	liettneff@bk.ru
 COMMENT=	Billing system for dialup and VPN users
@@ -39,10 +43,15 @@ pre-everything::
 	@ ${ECHO} ""
 
 post-extract:
+	@ ${MKDIR} ${WRKSRC}/var/log/q ${WRKSRC}/var/log/devices ${WRKSRC}/cgi-bin/admin/nets ${WRKSRC}/cgi-bin/admin/graphics ${WRKSRC}/backup
+
+post-patch:
+	@ ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} {} \;
 	@ ${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -i '' -e 's,/usr/abills,${PREFIX}/abills,g' {} \;
 
 do-install:
 	@ ${CP} -R ${WRKSRC} ${PREFIX}
+	@ ${CHOWN} -R www ${PREFIX}/abills/cgi-bin
 
 post-install:
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/net/abills/distinfo b/net/abills/distinfo
index f584cdf886ed..3159d0dab83b 100644
--- a/net/abills/distinfo
+++ b/net/abills/distinfo
@@ -1,2 +1,6 @@
-MD5 (abills-0.23b.tgz) = c9f97794263edaa16205dc6aae5cc07f
-SIZE (abills-0.23b.tgz) = 1239040
+MD5 (abills/abills-0.24b.tgz) = 80da63f60a8c259b0603e7183f499b0b
+SHA256 (abills/abills-0.24b.tgz) = 23d63e538043b20920b65094c6c939ec494fef55ae0d2f01c66833315f1c232b
+SIZE (abills/abills-0.24b.tgz) = 1259520
+MD5 (abills/patches-aa.tar.bz2) = 01570f9ebd938b8926a8c315cf561099
+SHA256 (abills/patches-aa.tar.bz2) = c833860b1afdcaae0ee3e9c71754488a7386f56ad1b5d3bb93752f05c422cfe1
+SIZE (abills/patches-aa.tar.bz2) = 20196
diff --git a/net/abills/files/pkg-message.in b/net/abills/files/pkg-message.in
index e15b66fbd0d0..6a02070f0f68 100644
--- a/net/abills/files/pkg-message.in
+++ b/net/abills/files/pkg-message.in
@@ -4,5 +4,7 @@
 For configuration and upgrade, please read file:
 %%PREFIX%%/abills/docs/index.html
 
+NOTE: please look for changes in abills.sql when upgrading!
+
 ************************************************************
 
diff --git a/net/abills/pkg-plist b/net/abills/pkg-plist
index 5a193ee236eb..814bbd6633a1 100644
--- a/net/abills/pkg-plist
+++ b/net/abills/pkg-plist
@@ -1,11 +1,11 @@
-@exec mkdir -p %D/abills/cgi-bin/admin/tmp
+@exec mkdir -p %D/abills/backup
 @exec mkdir -p %D/abills/cgi-bin/admin/graphics
 @exec mkdir -p %D/abills/cgi-bin/admin/nets
-@exec mkdir -p %D/abills/backup
 @exec mkdir -p %D/abills/libexec/ext_acct
 @exec mkdir -p %D/abills/var/q
-@exec mkdir -p %D/abills/var/log/back
+@exec mkdir -p %D/abills/var/log/q
 @exec mkdir -p %D/abills/var/devices
+@exec mkdir -p %D/abills/var/log/devices
 @exec mkdir -p %D/abills/miniserv/var
 abills/abills.sql
 abills/bin/abcm
@@ -14,7 +14,7 @@ abills/bin/uc
 abills/bin/uc.conf
 abills/bin/urdiff
 abills/cgi-bin/admin/Abdocs.pm
-abills/cgi-bin/admin/Abwconf.pm
+abills/cgi-bin/admin/Abwconf.pm.default
 abills/cgi-bin/admin/docs.cgi
 abills/cgi-bin/admin/grapher.cgi
 abills/cgi-bin/admin/messages.pl
@@ -40,6 +40,7 @@ abills/cgi-bin/img/vertblue.gif
 abills/cgi-bin/img/vertgreen.gif
 abills/cgi-bin/img/vertred.gif
 abills/cgi-bin/img/vertyellow.gif
+abills/cgi-bin/manager.cgi
 abills/cgi-bin/templates/account.tpl
 abills/cgi-bin/users.cgi
 abills/cgi-bin/win_dunes.cgi
@@ -47,21 +48,31 @@ abills/docs/img/inpayments.gif
 abills/docs/img/nas_servers.gif
 abills/docs/img/online.gif
 abills/docs/img/payments.gif
+abills/docs/img/user_fees.gif
 abills/docs/img/user_interface.gif
 abills/docs/img/user_manag.gif
 abills/docs/img/user_stats.gif
 abills/docs/img/users_list.gif
 abills/docs/index.htm
+abills/docs/mail.htm
+abills/docs/misc.htm
+abills/docs/mpd.htm
+abills/docs/nas.htm
 abills/dunes.sql
+abills/language/bulgarian.pl
 abills/language/english.pl
+abills/language/russian-koi8-r.pl
 abills/language/russian.pl
 abills/language/ukraine.pl
 abills/libexec/Base.pm
+abills/libexec/DES.pm
+abills/libexec/MSCHAP.pm
 abills/libexec/billd
-abills/libexec/config.pl
+abills/libexec/config.pl.default
 abills/libexec/linkupdown
 abills/libexec/mail.pl
 abills/libexec/modules/pm25.pl
+abills/libexec/modules/pppd.pl
 abills/libexec/modules/usr.pl
 abills/libexec/nas.pl
 abills/libexec/periodic
@@ -79,35 +90,28 @@ abills/miniserv/miniserv.pl
 abills/soft/exppp_asm-0.2.4.tar.gz
 abills/soft/expppd-0.2.1.tar.gz
 abills/soft/radpppd.tar.gz
-abills/libexec/DES.pm
-abills/libexec/MSCHAP.pm
 abills/soft/kha0s-mpd.tar.gz
-abills/docs/img/user_fees.gif
-abills/docs/mpd.htm
-abills/docs/mail.htm
-abills/language/bulgarian.pl
-@dirrm abills/cgi-bin/admin/tmp
-@dirrm abills/cgi-bin/admin/graphics
-@dirrm abills/cgi-bin/admin/nets
-@dirrm abills/cgi-bin/admin
-@dirrm abills/cgi-bin/img
-@dirrm abills/cgi-bin/templates
-@dirrm abills/cgi-bin
-@dirrm abills/backup
-@dirrm abills/soft
-@dirrm abills/bin
-@dirrm abills/libexec/ext_acct
-@dirrm abills/libexec/modules
-@dirrm abills/libexec
-@dirrm abills/language
 @dirrm abills/var/q
-@dirrm abills/var/log/back
+@dirrm abills/var/log/q
+@dirrm abills/var/log/devices
 @dirrm abills/var/log
 @dirrm abills/var/devices
 @dirrm abills/var
-@dirrm abills/docs/img
-@dirrm abills/docs
-@dirrm abills/miniserv/var
+@dirrm abills/soft
 @dirrm abills/miniserv/etc
 @dirrm abills/miniserv
+@dirrm abills/libexec/modules
+@dirrm abills/libexec/ext_acct
+@dirrm abills/libexec
+@dirrm abills/language
+@dirrm abills/docs/img
+@dirrm abills/docs
+@dirrm abills/cgi-bin/templates
+@dirrm abills/cgi-bin/img
+@dirrm abills/cgi-bin/admin/nets
+@dirrm abills/cgi-bin/admin/graphics
+@dirrm abills/cgi-bin/admin
+@dirrm abills/cgi-bin
+@dirrm abills/bin
+@dirrm abills/backup
 @dirrm abills