ports/73507: [patch] update to www/srg to 1.1

[Matthew Luckie]

>Number:         73507
>Category:       ports
>Synopsis:       [patch] update to www/srg to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 03 23:20:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Luckie
>Release:        FreeBSD 4.10R
>Organization:
University of Waikato
>Environment:
FreeBSD sorcerer.cs.waikato.ac.nz 4.10-RELEASE FreeBSD 4.10-RELEASE #10: Fri Jun 18 10:12:44 NZST 2004     root at sorcerer.cs.waikato.ac.nz:/usr/src/sys/compile/sorcerer  i386
>Description:
      update to www/srg 1.1.  i sent an earlier revision of this to the maintainer a week ago.  i have removed the PLIST_* macros from the Makefile and replaced that with a pkg-plist that uses PORTDOCS and EXAMPLESDIR to control installation of examples and documentation.
>How-To-Repeat:
      N/A
>Fix:
diff -uNr srg.orig/Makefile srg/Makefile
--- srg.orig/Makefile	Wed Jul  7 23:21:22 2004
+++ srg/Makefile	Thu Nov  4 12:11:54 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	srg
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://mirror.crc.net.nz/pub/srg/
@@ -25,12 +24,6 @@
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" \
 		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	bin/srg
-.for i in footer.php header.php ip2user.txt srg.conf
-PLIST_FILES+=	share/examples/srg/${i}
-.endfor
-PLIST_DIRS=	share/examples/srg
-
 post-patch:
 	${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \
 		${WRKSRC}/lib/Makefile
@@ -38,7 +31,9 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/srg ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff -uNr srg.orig/distinfo srg/distinfo
--- srg.orig/distinfo	Tue Jun 29 22:30:46 2004
+++ srg/distinfo	Thu Nov  4 12:00:35 2004
@@ -1,2 +1,2 @@
-MD5 (srg-1.0.tar.bz2) = ff9b5d19397500445b1f3ef82d43fbb8
-SIZE (srg-1.0.tar.bz2) = 62434
+MD5 (srg-1.1.tar.bz2) = e4cb56edceabad25d9b9c0270735cfaf
+SIZE (srg-1.1.tar.bz2) = 69798 
diff -uNr srg.orig/files/patch-resolver-test-cpp srg/files/patch-resolver-test-cpp
--- srg.orig/files/patch-resolver-test-cpp	Wed Jul  7 00:25:14 2004
+++ srg/files/patch-resolver-test-cpp	Thu Nov  4 12:00:35 2004
@@ -1,40 +1,11 @@
---- resolver-test.cpp.orig	Mon Jun  7 08:37:17 2004
-+++ resolver-test.cpp	Tue Jul  6 16:16:12 2004
-@@ -1,12 +1,15 @@
+--- 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 at cs.waikato.ac.nz>
  
- */
- 
- // grrr... stupid intel little endian!
--#define dottedquad(a,b,c,d) (a) + (b << 8) + (c << 16) + (d << 24);
-+#define dottedquad(a,b,c,d) htonl((d) + (c << 8) + (b << 16) + (a << 24));
- 
- int main(void) {
- 
-@@ -32,16 +35,16 @@
- 	}
- 	
- 	/* Use Root Servers because they are unlikey to change IP */
--	i.s_addr = dottedquad(128,9,0,107);
-+	i.s_addr = dottedquad(192,228,79,201);
- 	t = r.get_name(i);
- 	if (t) {
- 		if (strcasecmp(t, "b.root-servers.net")!=0) {
--			fprintf(stderr, "FAILED: 128.9.0.107 resolves to %s"
-+			fprintf(stderr, "FAILED: 192.228.79.201 resolves to %s"
- 				" expected b.root-servers.net please check "
- 				"your resolver!\n", t);
- 		}
- 	} else {
--		fprintf(stderr, "FAILED: Unable to resolve 128.9.0.107\n");
-+		fprintf(stderr, "FAILED: Unable to resolve 192.228.79.201\n");
- 	}
- 
- 	i.s_addr = dottedquad(192,203,230,10);
diff -uNr srg.orig/pkg-plist srg/pkg-plist
--- srg.orig/pkg-plist	Thu Jan  1 12:00:00 1970
+++ srg/pkg-plist	Thu Nov  4 12:13:34 2004
@@ -0,0 +1,12 @@
+bin/srg
+%%PORTDOCS%%%%EXAMPLESDIR%%/footer.php
+%%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%%

>Release-Note:
>Audit-Trail:
>Unformatted: