Index: head/net/bandwidthd/Makefile
===================================================================
--- head/net/bandwidthd/Makefile	(revision 98243)
+++ head/net/bandwidthd/Makefile	(revision 98244)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	bandwidthd
 # Date created:				Sun Nov  2
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bandwidthd
-PORTVERSION=	1.1.7
+PORTVERSION=	1.2.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-1.1.7b
+DISTNAME=		${PORTNAME}-1.2.0b
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	Tracks bandwidth usage by IP address
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd\
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
 				${PREFIX}/etc/rc.d/bandwidthd.sh.sample
 
 .include <bsd.port.mk>

Property changes on: head/net/bandwidthd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net/bandwidthd/distinfo
===================================================================
--- head/net/bandwidthd/distinfo	(revision 98243)
+++ head/net/bandwidthd/distinfo	(revision 98244)
@@ -1 +1 @@
-MD5 (bandwidthd-1.1.7b.tgz) = c58100aefc62e0d2b20024838ba527bf
+MD5 (bandwidthd-1.2.0b.tgz) = 001e361f312dac69a2a5eec6ce52e550

Property changes on: head/net/bandwidthd/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/bandwidthd/files/patch-Makefile
===================================================================
--- head/net/bandwidthd/files/patch-Makefile	(revision 98243)
+++ head/net/bandwidthd/files/patch-Makefile	(revision 98244)
@@ -1,35 +1,35 @@
---- Makefile.orig	Tue Dec  2 21:39:05 2003
-+++ Makefile	Fri Dec  5 02:30:31 2003
+--- Makefile.orig	Wed Jan 14 21:38:17 2004
++++ Makefile	Fri Jan 16 01:39:20 2004
 @@ -1,8 +1,8 @@
  #Possible optimizations -fomit-frame-pointer -ffast-math
  OBS= bandwidthd.o graph.o conf.tab.o conf.l.o
 -LIBS= -L/usr/local/lib -lgd -lpng -lpcap 
 -CFLAGS= -I/usr/local/include -O3 -Wall
 -NONWALLCFLAGS= -O3 #-g -DDEBUG
 +LIBS= -L${LOCALBASE}/lib -lgd -lpng -lpcap 
 +CFLAGS+= -I${LOCALBASE}/include
 +#NONWALLCFLAGS= -O3 #-g -DDEBUG
  
  # Debugging stuff
  #CFLAGS= -O3 -Wall -pg -DPROFILE
 @@ -44,13 +44,13 @@
  	rm -f *.o bandwidthd *~ conf.tab.c conf.tab.h conf.l.c DEADJOE
  
  install: all
--	mkdir -p $(DESTDIR)/usr/local/bandwidthd/etc
--	mkdir -p $(DESTDIR)/usr/local/bandwidthd/htdocs
+-	if [ ! -d $(DESTDIR)/usr/local/bandwidthd/etc ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/etc ; fi
+-	if [ ! -d $(DESTDIR)/usr/local/bandwidthd/htdocs ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/htdocs ; fi
 -	cp bandwidthd $(DESTDIR)/usr/local/bandwidthd	
--	cp etc/bandwidthd.conf $(DESTDIR)/usr/local/bandwidthd/etc/
+-	if [ ! -f $(DESTDIR)/usr/local/bandwidthd/etc/bandwidthd.conf ] ; then cp etc/bandwidthd.conf $(DESTDIR)/usr/local/bandwidthd/etc/ ; fi
 -	cp htdocs/legend.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
 -	cp htdocs/logo.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
 +	mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/etc
 +	mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/htdocs
-+	${BSD_INSTALL_PROGRAM} bandwidthd $(DESTDIR)${PREFIX}/bandwidthd	
++	${BSD_INSTALL_PROGRAM} bandwidthd $(DESTDIR)${PREFIX}/bandwidthd
 +	${BSD_INSTALL_DATA} etc/bandwidthd.conf $(DESTDIR)${PREFIX}/bandwidthd/etc/bandwidthd.conf-dist
 +	${BSD_INSTALL_DATA} htdocs/legend.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
 +	${BSD_INSTALL_DATA} htdocs/logo.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
  
  #**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors *******************
  conf.l.o: conf.l.c
 -	$(CC) $(NONWALLCFLAGS) -c -o conf.l.o conf.l.c	
-+	$(CC) -c -o conf.l.o conf.l.c	
++	$(CC) -c -o conf.l.o conf.l.c

Property changes on: head/net/bandwidthd/files/patch-Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/net-mgmt/bandwidthd/Makefile
===================================================================
--- head/net-mgmt/bandwidthd/Makefile	(revision 98243)
+++ head/net-mgmt/bandwidthd/Makefile	(revision 98244)
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	bandwidthd
 # Date created:				Sun Nov  2
 # Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bandwidthd
-PORTVERSION=	1.1.7
+PORTVERSION=	1.2.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-1.1.7b
+DISTNAME=		${PORTNAME}-1.2.0b
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	Tracks bandwidth usage by IP address
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd\
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
 				${PREFIX}/etc/rc.d/bandwidthd.sh.sample
 
 .include <bsd.port.mk>

Property changes on: head/net-mgmt/bandwidthd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net-mgmt/bandwidthd/distinfo
===================================================================
--- head/net-mgmt/bandwidthd/distinfo	(revision 98243)
+++ head/net-mgmt/bandwidthd/distinfo	(revision 98244)
@@ -1 +1 @@
-MD5 (bandwidthd-1.1.7b.tgz) = c58100aefc62e0d2b20024838ba527bf
+MD5 (bandwidthd-1.2.0b.tgz) = 001e361f312dac69a2a5eec6ce52e550

Property changes on: head/net-mgmt/bandwidthd/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/bandwidthd/files/patch-Makefile
===================================================================
--- head/net-mgmt/bandwidthd/files/patch-Makefile	(revision 98243)
+++ head/net-mgmt/bandwidthd/files/patch-Makefile	(revision 98244)
@@ -1,35 +1,35 @@
---- Makefile.orig	Tue Dec  2 21:39:05 2003
-+++ Makefile	Fri Dec  5 02:30:31 2003
+--- Makefile.orig	Wed Jan 14 21:38:17 2004
++++ Makefile	Fri Jan 16 01:39:20 2004
 @@ -1,8 +1,8 @@
  #Possible optimizations -fomit-frame-pointer -ffast-math
  OBS= bandwidthd.o graph.o conf.tab.o conf.l.o
 -LIBS= -L/usr/local/lib -lgd -lpng -lpcap 
 -CFLAGS= -I/usr/local/include -O3 -Wall
 -NONWALLCFLAGS= -O3 #-g -DDEBUG
 +LIBS= -L${LOCALBASE}/lib -lgd -lpng -lpcap 
 +CFLAGS+= -I${LOCALBASE}/include
 +#NONWALLCFLAGS= -O3 #-g -DDEBUG
  
  # Debugging stuff
  #CFLAGS= -O3 -Wall -pg -DPROFILE
 @@ -44,13 +44,13 @@
  	rm -f *.o bandwidthd *~ conf.tab.c conf.tab.h conf.l.c DEADJOE
  
  install: all
--	mkdir -p $(DESTDIR)/usr/local/bandwidthd/etc
--	mkdir -p $(DESTDIR)/usr/local/bandwidthd/htdocs
+-	if [ ! -d $(DESTDIR)/usr/local/bandwidthd/etc ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/etc ; fi
+-	if [ ! -d $(DESTDIR)/usr/local/bandwidthd/htdocs ] ; then mkdir -p $(DESTDIR)/usr/local/bandwidthd/htdocs ; fi
 -	cp bandwidthd $(DESTDIR)/usr/local/bandwidthd	
--	cp etc/bandwidthd.conf $(DESTDIR)/usr/local/bandwidthd/etc/
+-	if [ ! -f $(DESTDIR)/usr/local/bandwidthd/etc/bandwidthd.conf ] ; then cp etc/bandwidthd.conf $(DESTDIR)/usr/local/bandwidthd/etc/ ; fi
 -	cp htdocs/legend.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
 -	cp htdocs/logo.gif $(DESTDIR)/usr/local/bandwidthd/htdocs/
 +	mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/etc
 +	mkdir -p $(DESTDIR)${PREFIX}/bandwidthd/htdocs
-+	${BSD_INSTALL_PROGRAM} bandwidthd $(DESTDIR)${PREFIX}/bandwidthd	
++	${BSD_INSTALL_PROGRAM} bandwidthd $(DESTDIR)${PREFIX}/bandwidthd
 +	${BSD_INSTALL_DATA} etc/bandwidthd.conf $(DESTDIR)${PREFIX}/bandwidthd/etc/bandwidthd.conf-dist
 +	${BSD_INSTALL_DATA} htdocs/legend.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
 +	${BSD_INSTALL_DATA} htdocs/logo.gif $(DESTDIR)${PREFIX}/bandwidthd/htdocs/
  
  #**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors *******************
  conf.l.o: conf.l.c
 -	$(CC) $(NONWALLCFLAGS) -c -o conf.l.o conf.l.c	
-+	$(CC) -c -o conf.l.o conf.l.c	
++	$(CC) -c -o conf.l.o conf.l.c

Property changes on: head/net-mgmt/bandwidthd/files/patch-Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property