4 files changed, 20 insertions, 38 deletions

diff --git a/www/srg/Makefile b/www/srg/Makefile
index e6e2ac899f0b..b5cb72ec2992 100644
--- a/www/srg/Makefile
+++ b/www/srg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	srg
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.3.6
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://mirror.crc.net.nz/pub/srg/
@@ -15,21 +14,26 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Squid Report Generator
 
-USE_GMAKE=	yes
-USE_BISON=	build
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_BZIP2=	yes
-NO_INSTALL_MANPAGES=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		srg.1
 
 post-patch:
-	${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \
-		${WRKSRC}/lib/Makefile
-	${REINPLACE_CMD} -e 's|^\(LDFLAGS\)=|\1+=|' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/srg ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${REINPLACE_CMD} -e \
+		'/CPPFLAGS/s|-I/usr/local/include|| ; \
+		 /LDFLAGS/s|-L/usr/local/lib||' ${WRKSRC}/configure
+
+post-install:
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for ex in srg.daily srg.monthly srg.weekly
+	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/srg/distinfo b/www/srg/distinfo
index 8ed3e63bcbe2..799c2d8256ec 100644
--- a/www/srg/distinfo
+++ b/www/srg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (srg-1.1.tar.bz2) = dd782de2620928017c7089843507b022b6510247f71c0f089f526f5c69c97d20
-SIZE (srg-1.1.tar.bz2) = 69798
+SHA256 (srg-1.3.6.tar.bz2) = 3645705859b8fcf4208c2243469d4682687612819110db7ff97095bdd9cef814
+SIZE (srg-1.3.6.tar.bz2) = 329150
diff --git a/www/srg/files/patch-resolver-test-cpp b/www/srg/files/patch-resolver-test-cpp
deleted file mode 100644
index b8714a2c33a1..000000000000
--- a/www/srg/files/patch-resolver-test-cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- resolver-test.cpp.orig	Thu Oct 28 10:31:59 2004
-+++ resolver-test.cpp	Thu Oct 28 10:33:18 2004
-@@ -1,5 +1,7 @@
--#include "resolver.hh"
-+#include <sys/param.h>
- #include <assert.h>
-+
-+#include "resolver.hh"
- /*
-  Originally Written by John MacPherson <jrm21@cs.waikato.ac.nz>
- 
diff --git a/www/srg/pkg-plist b/www/srg/pkg-plist
deleted file mode 100644
index 8fa17b083964..000000000000
--- a/www/srg/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/srg
-%%PORTDOCS%%%%EXAMPLESDIR%%/footer.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/header.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/ip2user.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/srg.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/srg.daily
-%%PORTDOCS%%%%EXAMPLESDIR%%/srg.js
-%%PORTDOCS%%%%EXAMPLESDIR%%/srg.monthly
-%%PORTDOCS%%%%EXAMPLESDIR%%/srg.weekly
-%%PORTDOCS%%%%EXAMPLESDIR%%/style.css
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%