6 files changed, 41 insertions, 22 deletions

diff --git a/www/pglogd/Makefile b/www/pglogd/Makefile
index c89245c3cfd7..c780100c070a 100644
--- a/www/pglogd/Makefile
+++ b/www/pglogd/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	pglogd
-PORTVERSION=	2.2b
-PORTREVISION=	1
+PORTVERSION=	2.3
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.digitalstratum.com/pglogd/
-DISTNAME=	pglogd-2.2beta
 
 MAINTAINER=	allie@pajunas.com
 COMMENT=	Sends web server log entries to a PostgreSQL database
diff --git a/www/pglogd/distinfo b/www/pglogd/distinfo
index d97e56c23a42..de3937817cf4 100644
--- a/www/pglogd/distinfo
+++ b/www/pglogd/distinfo
@@ -1,2 +1,2 @@
-MD5 (pglogd-2.2beta.tar.gz) = af94fba991e7bf432f8464f787319708
-SIZE (pglogd-2.2beta.tar.gz) = 19755
+MD5 (pglogd-2.3.tar.gz) = 49e494598d1502cf2a20356146fab654
+SIZE (pglogd-2.3.tar.gz) = 22796
diff --git a/www/pglogd/files/020.pglogd.sh b/www/pglogd/files/020.pglogd.sh
index 7494cb35180e..03a1bb10cb00 100644
--- a/www/pglogd/files/020.pglogd.sh
+++ b/www/pglogd/files/020.pglogd.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-CONFIG=%%PREFIX%%/pglogd.conf
+CONFIG=%%PREFIX%%/etc/pglogd.conf
 PID=/var/run/pglogd.pid
 
 case "$1" in
diff --git a/www/pglogd/files/patch-Makefile b/www/pglogd/files/patch-Makefile
index 51e6cd9ccfe7..9ba5263b0b0c 100644
--- a/www/pglogd/files/patch-Makefile
+++ b/www/pglogd/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile	Sat Jan 19 11:05:45 2002
-+++ Makefile.new	Wed Apr 23 17:28:05 2003
-@@ -31,7 +31,7 @@
+--- Makefile.orig	Wed Nov  5 18:41:01 2003
++++ Makefile	Sun Feb 22 21:15:50 2004
+@@ -31,16 +31,15 @@
  #
  
  # Change this to your PostgreSQL install directroy.
@@ -9,17 +9,36 @@
  
  
  ### NO NEED TO EDIT BELOW THIS LINE ###
-@@ -56,3 +56,13 @@
  
- pglog_dump : ${SRCS_DUMP} ${HDRS_DUMP}
- 	${CC} ${COPTS} -o $@ ${CFLAGS} ${LDFLAGS} ${LIBS} ${SRCS_DUMP}
+ CC = gcc
+-COPTS = -O -Wall
+ LIBS = -lpq
+-CFLAGS = -I${PGDIR}/include
+-LDFLAGS = -L${PGDIR}/lib
++CFLAGS+= -I${PGDIR}/include
++LDFLAGS+= -L${PGDIR}/lib
+ 
+ 
+ SRCS_LOG = pglogd.c
+@@ -51,7 +50,19 @@
+ all : pglogd pglogctl
+ 
+ pglogd : ${SRCS_LOG} ${HDRS_LOG}
+-	${CC} ${COPTS} -o $@ ${CFLAGS} ${LDFLAGS} ${LIBS} ${SRCS_LOG}
++	${CC} -o $@ ${CFLAGS} ${LDFLAGS} ${LIBS} ${SRCS_LOG}
+ 
+ pglogctl : ${SRCS_LOGCTL}
+-	${CC} ${COPTS} -o $@ ${CFLAGS} ${LDFLAGS} ${LIBS} ${SRCS_LOGCTL}
++	${CC} -o $@ ${CFLAGS} ${LDFLAGS} ${LIBS} ${SRCS_LOGCTL}
 +
++PGLOGD_SHARE=	${PREFIX}/share/pglogd
 +install :
-+	install -m 750 -s -c pglogd ${PREFIX}/bin/
-+	install -m 755 -d ${PREFIX}/share/pglogd/
-+	install -m 644 -c pglogd_tables.sql ${PREFIX}/share/pglogd/pglogd_tables.sql
-+	install -m 644 -c README ${PREFIX}/share/pglogd/README
-+	install -m 644 -c CHANGELOG ${PREFIX}/share/pglogd/CHANGELOG
-+	install -m 644 -c weblog_daily.sql ${PREFIX}/share/pglogd/weblog_daily.sql
-+	install -m 644 -c queries.txt ${PREFIX}/share/pglogd/queries.txt
-+	install -m 644 -c pglogd.conf ${PREFIX}/etc/pglogd.conf.sample
++	install -m 750 -s -c pglogd ${PREFIX}/bin
++	install -m 750 -s -c pglogctl ${PREFIX}/bin
++	install -m 755 -d ${PREFIX}/share/pglogd
++	install -m 644 -c pglogd_tables.sql ${PGLOGD_SHARE}
++	install -m 644 -c README ${PGLOGD_SHARE}
++	install -m 644 -c CHANGELOG ${PGLOGD_SHARE}
++	install -m 644 -c weblog_daily.sql ${PGLOGD_SHARE}
++	install -m 644 -c queries.txt ${PGLOGD_SHARE}
++	install -m 644 -c pglogd.conf ${PGLOGD_SHARE}
diff --git a/www/pglogd/pkg-message b/www/pglogd/pkg-message
index 9a2e29a522ad..8ac129f36f63 100644
--- a/www/pglogd/pkg-message
+++ b/www/pglogd/pkg-message
@@ -6,7 +6,8 @@ You need to create a PostgreSQL database for your logs:
   $ psql pglogd < /usr/local/share/pglogd/pglogd_tables.sql
   $ exit
 
-and copy /usr/local/etc/pglogd.conf.sample to pglogd.conf
+and copy /usr/local/share/pglogd/pglogd.conf
+to /usr/local/etc/pglogd.conf
 
 pglogd can then be started with:
 
diff --git a/www/pglogd/pkg-plist b/www/pglogd/pkg-plist
index 8767dc370d48..5f0afb151df7 100644
--- a/www/pglogd/pkg-plist
+++ b/www/pglogd/pkg-plist
@@ -1,10 +1,11 @@
+bin/pglogctl
 bin/pglogd
 share/pglogd/pglogd_tables.sql
+share/pglogd/pglogd.conf
 share/pglogd/queries.txt
 share/pglogd/weblog_daily.sql
 share/pglogd/README
 share/pglogd/CHANGELOG
-etc/pglogd.conf.sample
 etc/rc.d/020.pglogd.sh
 @dirrm share/pglogd
 @unexec if cmp -s %D/etc/rc.d/020.pglogd.sh %D/etc/rc.d/020.pglogd.sh-dist; then rm -f %D/etc/rc.d/020.pglogd.sh; fi