- upgrade to 1.0.0-snap20010225 (PORTVERSION= 1.0.0.b1)

- respect $PREFIX, $CC and $CFLAGS

maintainer timeout...

4 files changed, 65 insertions, 26 deletions

diff --git a/mail/listar/Makefile b/mail/listar/Makefile
index d236aa147763..77ba603994d6 100644
--- a/mail/listar/Makefile
+++ b/mail/listar/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	listar
-PORTVERSION=	0.129a
+PORTVERSION=	1.0.0.b1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.listar.org/pub/listar/
+MASTER_SITES=	ftp://ftp.listar.org/pub/listar/snapshots/tar/
+DISTFILES=	listar-1.0.0-snap20010225${EXTRACT_SUFX}
 
 MAINTAINER=	plosher@wwiv.com
 
 USE_GMAKE=	yes
 
 NO_PACKAGE=	"Requires listar uid"
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/listar-1.0.0/src
 
 pre-patch:
 
diff --git a/mail/listar/distinfo b/mail/listar/distinfo
index 6154bafefbf9..381398d4dd4c 100644
--- a/mail/listar/distinfo
+++ b/mail/listar/distinfo
@@ -1 +1 @@
-MD5 (listar-0.129a.tar.gz) = c9b6c5297def7c6c30740bb5c8a39f32
+MD5 (listar-1.0.0-snap20010225.tar.gz) = 5651e42b2aee2f1383cca88e15f669cb
diff --git a/mail/listar/files/patch-aa b/mail/listar/files/patch-aa
index 64748403015b..4a8b873ad841 100644
--- a/mail/listar/files/patch-aa
+++ b/mail/listar/files/patch-aa
@@ -1,17 +1,17 @@
---- Makefile.dist	Thu Nov 11 16:49:23 1999
-+++ Makefile	Sat Apr  8 23:44:45 2000
+--- Makefile.orig	Sun Jun 17 22:13:03 2001
++++ Makefile	Sun Jun 17 22:14:19 2001
 @@ -6,8 +6,8 @@
  # they should be set.  All of them are conditional on options set in this
  # file, so it should be relatively easy to determine which branch is correct
  
 -BINDIR = ..
 -MODDIR = ../modules
-+BINDIR = /usr/local/listar
-+MODDIR = /usr/local/listar/modules
++BINDIR = ${PREFIX}/listar
++MODDIR = ${PREFIX}/listar/modules
  
  # First things first we need to set up some various options since OS's aren't
  # as nice about things are they could be.
-@@ -27,7 +27,7 @@
+@@ -38,7 +38,7 @@
  # Uncomment this if you are on a BSD system AND you want dynamic modules
  # SunOS (4 and 5 both) also needs this setting.
  #
@@ -20,7 +20,7 @@
  
  # Uncomment this if you are compiling on OpenBSD with modules (BSDMOD = 1)
  #OBSDMOD = 1
-@@ -49,7 +49,7 @@
+@@ -60,7 +60,7 @@
  # Uncomment this if you have the GNU strftime() function.  This version
  # of the function understands %z to return the numerical offset.  It's better
  # to use that if it's available for RFC822 date headers
@@ -29,7 +29,24 @@
  
  # Uncomment this if you are on a machine that doesn't have strerror()
  #
-@@ -301,6 +301,7 @@
+@@ -125,7 +125,6 @@
+ ifdef BSDIMOD
+ CC=shlicc
+ else
+-CC=gcc
+ endif
+ 
+ # Warning-level flags.  Under SunOS (4 and 5), this NEEDS TO BE BLANK.
+@@ -134,7 +133,7 @@
+ #
+ # It appears that IRIX is also rather stupid, and may require this
+ # to be removed.
+-WFLAGS=-Wall -Werror
++WFLAGS:=${CFLAGS}
+ 
+ # Now set up the initial command line.  SUNOS_5 makes this a bit wierd.
+ ifndef SUNOS_5
+@@ -321,6 +320,7 @@
  install: targets
  	cp build/listar ${BINDIR}
  	chmod ug+s ${BINDIR}/listar
diff --git a/mail/listar/pkg-plist b/mail/listar/pkg-plist
index 059069863089..2b3e5b0e2baf 100644
--- a/mail/listar/pkg-plist
+++ b/mail/listar/pkg-plist
@@ -15,37 +15,58 @@ listar/listar.cfg.dist
 listar/listar.dsw
 listar/listar.hlp
 listar/listar.spec
+listar/lists/test/config
+listar/lists/test/cookies
 listar/lists/test/text/blacklist.txt
 listar/lists/test/text/closed-post.txt
 listar/lists/test/text/footer.txt
 listar/lists/test/text/intro.txt
-listar/lists/test/config
-listar/lists/test/cookies
 listar/lists/test/users
 listar/modules/README
-listar/modules/bouncer.lpm
-listar/modules/listarchive.lpm
-listar/modules/filearchive.lpm
-listar/modules/admin.lpm
 listar/modules/acctmgr.lpm
-listar/modules/stat.lpm
-listar/modules/send.lpm
+listar/modules/admin.lpm
+listar/modules/administrivia.lpm
+listar/modules/antispam.lpm
 listar/modules/base.lpm
+listar/modules/bouncer.lpm
 listar/modules/digest.lpm
-listar/modules/antispam.lpm
-listar/modules/administrivia.lpm
-listar/modules/toolbox.lpm
+listar/modules/filearchive.lpm
+listar/modules/listarchive.lpm
+listar/modules/lsg2.lpm
 listar/modules/pantomime.lpm
-listar/modules/listargate.lpm
 listar/modules/password.lpm
+listar/modules/send.lpm
+listar/modules/stat.lpm
+listar/modules/toolbox.lpm
 listar/queue/README
-listar/scripts/listargate.cgi.dist
 listar/scripts/fixlist.pl.dist
+listar/scripts/lsg2.cgi.dist
 listar/spam-regexp.sample
+listar/templates/admin-userinfo.lsc
+listar/templates/admin-usersetinfo.lsc
+listar/templates/adminmenu.lsc
+listar/templates/config.lsc
+listar/templates/error.lsc
+listar/templates/fileedit.lsc
+listar/templates/flagedit.lsc
+listar/templates/footer.lsc
+listar/templates/frontpage.lsc
+listar/templates/generic.lsc
+listar/templates/header.lsc
+listar/templates/listmenu.lsc
+listar/templates/logincookie.lsc
+listar/templates/mainmenu.lsc
+listar/templates/subscribe.lsc
+listar/templates/textfile.lsc
+listar/templates/unsubscribe.lsc
+listar/templates/userinfo.lsc
+listar/templates/userlist-deny.lsc
+listar/templates/userlist.lsc
 @dirrm listar/lists/test/text
 @dirrm listar/lists/test
 @dirrm listar/lists
-@dirrm listar/modules
-@dirrm listar/queue
+@dirrm listar/templates
 @dirrm listar/scripts
+@dirrm listar/queue
+@dirrm listar/modules
 @dirrm listar