- Update to 0.33 [1]

- OPTIONify [2]

PR:		ports/99951 [1]
Submitted by:	maintainer [1], me (itetcu) [2]

3 files changed, 27 insertions, 25 deletions

diff --git a/net/abills/Makefile b/net/abills/Makefile
index e94d60e9682b..28b15ed489e2 100644
--- a/net/abills/Makefile
+++ b/net/abills/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	abills
-PORTVERSION=	0.32
+PORTVERSION=	0.33
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,17 +27,15 @@ USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+
+OPTIONS=	GRAPHICS "Traffic graphs (experimental)" off
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_GRAPHICS)
 RUN_DEPENDS+=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool
 .endif
 
-pre-everything::
-	@ ${ECHO} ""
-	@ ${ECHO} "	Define WITH_GRAPHICS if you want traffic graphs (experimental)"
-	@ ${ECHO} ""
-
 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' {} \;
@@ -50,4 +48,4 @@ do-install:
 post-install:
 	@ ${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/abills/distinfo b/net/abills/distinfo
index 2b6bc2b6eede..8c0c752c37bf 100644
--- a/net/abills/distinfo
+++ b/net/abills/distinfo
@@ -1,3 +1,3 @@
-MD5 (abills/abills-0.32.tgz) = 0842f580dddcdde18627159fcd9a4fe7
-SHA256 (abills/abills-0.32.tgz) = 4443a352979aeab9d8c9e2eaf509badecedc00a33f7448bbf907cb485f131f41
-SIZE (abills/abills-0.32.tgz) = 1536000
+MD5 (abills/abills-0.33.tgz) = fabcb2615eea10b809abb7fd4640754e
+SHA256 (abills/abills-0.33.tgz) = 59f13c916fceeb53fe941d1e53b2bc910c8f77b780401c6318ae869a6e48d903
+SIZE (abills/abills-0.33.tgz) = 1536000
diff --git a/net/abills/pkg-plist b/net/abills/pkg-plist
index 6246ce17e0b9..2ffae87ab3c0 100644
--- a/net/abills/pkg-plist
+++ b/net/abills/pkg-plist
@@ -142,20 +142,6 @@ abills/db/Cards.sql
 abills/db/Dunes.sql
 abills/db/Ipn.sql
 abills/db/Mdelivery.sql
-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/language/bulgarian.pl
 abills/language/english.pl
 abills/language/russian-koi8-r.pl
@@ -182,6 +168,24 @@ abills/soft/exppp_asm-0.2.4.tar.gz
 abills/soft/expppd-0.2.1.tar.gz
 abills/soft/kha0s-mpd.tar.gz
 abills/soft/radpppd.tar.gz
+abills/libexec/rlm_perl.pl
+abills/cgi-bin/print.css
+abills/docs/img/users_list.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/inpayments.gif
+abills/docs/index.htm
+abills/docs/mail.htm
+abills/docs/misc.htm
+abills/docs/mpd.htm
+abills/docs/nas.htm
+@dirrm abills/var/log
+@dirrm abills/var
 @dirrm abills/soft
 @dirrm abills/misc
 @dirrm abills/miniserv/etc