- Update to 0.11

5 files changed, 55 insertions, 50 deletions

diff --git a/news/nntpswitch/Makefile b/news/nntpswitch/Makefile
index 98f910eb8c07..b23b71659622 100644
--- a/news/nntpswitch/Makefile
+++ b/news/nntpswitch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nntpswitch
-PORTVERSION=	0.10
+PORTVERSION=	0.11
 CATEGORIES=	news
 MASTER_SITES=	http://www.nntpswitch.org/download/
 
@@ -23,8 +23,7 @@ MAKE_ENV+=	PERL=${PERL} LIBS="${LDFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-ETC_FILES=	access.conf auth.conf overview.fmt profiles.conf \
-		servers.conf passwd
+ETC_FILES=	access.conf servers.conf
 
 ETC_DIR=	${PREFIX}/etc/${PORTNAME}
 # dirty hack...
@@ -34,19 +33,25 @@ ALL_TARGET=	all
 USE_MYSQL=	YES
 ALL_TARGET+=	mysql
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
-PLIST_FILES+=	lib/libauth_mysql.so
+PLIST_FILES+=	lib/${PORTNAME}/auth_mysql.so
 .endif
 
 .if defined(WITH_POSTGRESQL)
 USE_PGSQL=	YES
 ALL_TARGET+=	postgres
-PLIST_FILES+=	lib/libauth_postgres.so
+PLIST_FILES+=	lib/${PORTNAME}/auth_postgres.so
 .endif
 
 .if defined(WITH_FREERADIUS)
 LIB_DEPENDS+=	radius:${PORTSDIR}/net/freeradius
 ALL_TARGET+=	radius
-PLIST_FILES+=	lib/libauth_radius.so lib/libacct_radius.so
+PLIST_FILES+=	lib/${PORTNAME}/auth_radius.so lib/${PORTNAME}/acct_radius.so
+.endif
+
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=	YES
+ALL_TARGET+=	ldap
+PLIST_FILES+=	lib/${PORTNAME}/auth_ldap.so
 .endif
 
 do-configure:
diff --git a/news/nntpswitch/distinfo b/news/nntpswitch/distinfo
index 3c354a3dfe83..35c78e40a406 100644
--- a/news/nntpswitch/distinfo
+++ b/news/nntpswitch/distinfo
@@ -1,2 +1,2 @@
-MD5 (nntpswitch-0.10.tar.gz) = 01659b763f389bbd729b481a46f75458
-SIZE (nntpswitch-0.10.tar.gz) = 53709
+MD5 (nntpswitch-0.11.tar.gz) = e032f2944c1afa86c83e52048ccc0665
+SIZE (nntpswitch-0.11.tar.gz) = 86116
diff --git a/news/nntpswitch/files/patch-Makefile b/news/nntpswitch/files/patch-Makefile
index c659d992f1ad..767e81ef5886 100644
--- a/news/nntpswitch/files/patch-Makefile
+++ b/news/nntpswitch/files/patch-Makefile
@@ -1,27 +1,27 @@
---- Makefile.orig	Mon Mar  8 11:37:11 2004
-+++ Makefile	Wed Mar 24 00:53:21 2004
-@@ -1,7 +1,3 @@
-- 
+--- Makefile.orig	Mon Nov 29 16:45:38 2004
++++ Makefile	Sun Oct 30 14:48:01 2005
+@@ -1,7 +1,5 @@
+  
 -PREFIX   = /usr/local
+ LIBDIR	 = lib/nntpswitch
 -PERL	 = /usr/bin/perl
--
+ 
  PROG     = nntpswitchd
  INSTUTILS= nsstats.pl nsstats.sh updategroups
- 
-@@ -13,10 +9,8 @@
+@@ -50,10 +48,8 @@
  
  DISTNAME = nntpswitch
  VERSION  = `/bin/sh version.sh`
 -CC       = gcc
--CFLAGS   = -pipe -g -O3 -Wall -D_VERSION=\"$(VERSION)\"
+-CFLAGS   = -pipe -g -O3 -Wall -DVERSION=\"$(VERSION)\"
 -LDFLAGS  = 
 -LIBS     = -lm -ldl 
-+CFLAGS  += -D_VERSION=\"$(VERSION)\"
-+LIBS    += -lm
++CFLAGS   += -DVERSION=\"$(VERSION)\"
++LIBS     += -lm 
  _DIRNAME = $(DISTNAME)
  
  all:		protos config aconfig.o $(PROG) $(MODULES) updategroups
-@@ -33,6 +27,10 @@
+@@ -70,6 +66,10 @@
  updategroups:	$(UGOBJS)
  		$(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) $(UGOBJS) -o updategroups
  
@@ -32,11 +32,13 @@
  $(PROG):	$(OBJS)
  		$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) aconfig.o $(LIBS) -o $(PROG) 
  
-@@ -82,7 +80,6 @@
- 		@if [ -f acct_radius.so ]; then cp acct_radius.so $(PREFIX)/lib/libacct_radius.so; fi
- 		@if [ -f auth_postgres.so ]; then cp auth_postgres.so $(PREFIX)/lib/libauth_postgres.so; fi
- 		@if [ -f auth_mysql.so ]; then cp auth_mysql.so $(PREFIX)/lib/libauth_mysql.so; fi
+@@ -140,8 +140,7 @@
+ 		install -b $(INSTUTILS) $(PREFIX)/sbin/
+ 		@echo "Installing modules in $(PREFIX)/$(LIBDIR)"
+ 		@if [ ! -d $(PREFIX)/$(LIBDIR) ]; then mkdir $(PREFIX)/$(LIBDIR); fi
+-		@for f in $(MODULES) $(CONDMODS); do if [ -f $$f ]; then cp $$f $(PREFIX)/$(LIBDIR)/$$f.$(VERSION); fi; done
 -		ldconfig
++		@for f in $(MODULES) $(CONDMODS); do if [ -f $$f ]; then cp $$f $(PREFIX)/$(LIBDIR)/$$f; fi; done
  
  help:
  		@echo "Choose one of the following targets:"
diff --git a/news/nntpswitch/files/patch-nntpswitch.conf.in b/news/nntpswitch/files/patch-nntpswitch.conf.in
index 9e742979e68e..9829315cfe4c 100644
--- a/news/nntpswitch/files/patch-nntpswitch.conf.in
+++ b/news/nntpswitch/files/patch-nntpswitch.conf.in
@@ -1,27 +1,29 @@
---- nntpswitch.conf.in.orig	Thu Mar 18 18:13:36 2004
-+++ nntpswitch.conf.in	Thu Mar 18 18:14:54 2004
-@@ -11,16 +11,16 @@
+--- nntpswitch.conf.in.orig	Fri Apr 23 13:30:04 2004
++++ nntpswitch.conf.in	Sun Oct 30 14:32:31 2005
+@@ -10,7 +10,7 @@
+ string PidFile /var/run/nntpswitchd.pid
+ 
+ # Every file or dirname not starting with a / has BasePath prepended
+-string BasePath /etc/nntpswitch
++string BasePath %%PREFIX%%/etc/nntpswitch
  
  # Paths and Files 
  # kill -1 will reload these
--string AccessFile /etc/nntpswitch/access.conf
--string AuthFile /etc/nntpswitch/auth.conf
--string ProfileFile /etc/nntpswitch/profiles.conf
--string ServerFile /usr/local/etc/nntpswitch/servers.conf
-+string AccessFile %%PREFIX%%/etc/nntpswitch/access.conf
-+string AuthFile %%PREFIX%%/etc/nntpswitch/auth.conf
-+string ProfileFile %%PREFIX%%/etc/nntpswitch/profiles.conf
-+string ServerFile %%PREFIX%%/etc/nntpswitch/servers.conf
+@@ -18,8 +18,8 @@
+ string ServerFile servers.conf
  
--string OverviewFmtFile /etc/nntpswitch/overview.fmt
+ string OverviewFmtFile overview.fmt
 -string ActiveFile /etc/nntpswitch/active
 -string NewsgroupsFile /etc/nntpswitch/newsgroups
-+string OverviewFmtFile %%PREFIX%%/etc/nntpswitch/overview.fmt
 +string ActiveFile %%PREFIX%%/etc/nntpswitch/active
 +string NewsgroupsFile %%PREFIX%%/etc/nntpswitch/newsgroups
  
--string ModulePath /usr/local/lib
-+string ModulePath %%PREFIX%%/lib
+ string ModulePath /usr/local/lib
+ 
+@@ -92,5 +92,5 @@
+ int DropUnknown 10
  
- # Timeout for server reading
- int ServerReadTimeout 300
+ # touch this file to temporarily disable the server
+-string DisableFile /etc/nntpswitch/closed
++string DisableFile %%PREFIX%%/etc/nntpswitch/closed
+ string DisableText 500 Sorry, we're closed.
diff --git a/news/nntpswitch/pkg-plist b/news/nntpswitch/pkg-plist
index 2b9edba861b6..ce7ee49ed3ba 100644
--- a/news/nntpswitch/pkg-plist
+++ b/news/nntpswitch/pkg-plist
@@ -1,17 +1,13 @@
 etc/nntpswitch/access.conf-dist
-etc/nntpswitch/auth.conf-dist
 etc/nntpswitch/nntpswitch.conf-dist
-etc/nntpswitch/overview.fmt-dist
-etc/nntpswitch/profiles.conf-dist
 etc/nntpswitch/servers.conf-dist
-etc/nntpswitch/passwd-dist
 etc/rc.d/nntpswitch.sh-dist
-lib/libacct_none.so
-lib/libacct_syslog.so
-lib/libauth_ignore.so
-lib/libauth_passwd.so
-lib/libauth_pop3.so
-lib/libauth_remote.so
+lib/nntpswitch/acct_none.so
+lib/nntpswitch/acct_syslog.so
+lib/nntpswitch/auth_ignore.so
+lib/nntpswitch/auth_passwd.so
+lib/nntpswitch/auth_pop3.so
+lib/nntpswitch/auth_remote.so
 sbin/nntpswitchd
 sbin/nsstats.pl
 sbin/nsstats.sh