[41226] trunk/dports/net/rancid

[markd at macports.org]

Revision: 41226
          http://trac.macports.org/changeset/41226
Author:   markd at macports.org
Date:     2008-10-28 11:47:42 -0700 (Tue, 28 Oct 2008)
Log Message:
-----------
Update to 2.3.2a7.  Has important fixes and a -devel port seems unneccessary.

Modified Paths:
--------------
    trunk/dports/net/rancid/Portfile

Added Paths:
-----------
    trunk/dports/net/rancid/files/
    trunk/dports/net/rancid/files/patch-etc-Makefile.in

Modified: trunk/dports/net/rancid/Portfile
===================================================================
--- trunk/dports/net/rancid/Portfile	2008-10-28 14:53:38 UTC (rev 41225)
+++ trunk/dports/net/rancid/Portfile	2008-10-28 18:47:42 UTC (rev 41226)
@@ -3,8 +3,7 @@
 PortSystem	1.0
 
 name				rancid
-version				2.3.1
-revision			3
+version				2.3.2a7
 categories			net
 maintainers			markd
 platforms			darwin
@@ -17,13 +16,15 @@
 
 homepage			http://www.shrubbery.net/rancid
 master_sites		        ftp://ftp.shrubbery.net/pub/rancid/
-checksums			md5 b188595e528515b4f87078f63936d355
+checksums			md5 545355c56b56fc94adf09df8b3e40ded
 
 depends_lib                     port:perl5.8 \
 				port:openssl \
 				port:p5-lockfile-simple
 
-# RANCID needs at least expect version 5.40 and only darwin 8 meets the requirement
+patchfiles			patch-etc-Makefile.in
+
+# RANCID needs expect version >= 5.40 and only darwin 8 and above meets this requirement
 platform darwin 7 {
 		depends_lib-append port:expect
 }
@@ -33,13 +34,6 @@
 }
 
 pre-configure {
-# Fix broken DESTDIR support
- 		reinplace "s|@bindir@|${destroot}@bindir@|g" \
-        ${worksrcpath}/Makefile.in ${worksrcpath}/bin/Makefile.in
-                reinplace "s|@sysconfdir@|${destroot}@sysconfdir@|g" \
-        ${worksrcpath}/Makefile.in ${worksrcpath}/etc/Makefile.in
-                reinplace "s|@localstatedir@|${destroot}@localstatedir@|g" \
-        ${worksrcpath}/Makefile.in
 # Set path for lg.conf.sample so Looking Glass will work
 		reinplace "s|@prefix@/bin|@prefix@/libexec/rancid:@prefix@/bin|g" \
         ${worksrcpath}/etc/lg.conf.sample.in
@@ -50,7 +44,6 @@
 				--sysconfdir=${prefix}/etc/${name} \
 				--mandir=\\\${prefix}/share/man
 
-destroot.destdir                prefix=${destroot}${prefix}
 post-destroot {
 		xinstall -d 755  ${destroot}${prefix}/bin
 		system "ln -s -f ${prefix}/libexec/${name}/rancid-cvs ${destroot}${prefix}/bin/rancid-cvs"
@@ -72,17 +65,23 @@
 (show ip route, show run, etc) against your devices from a web form,
 perform these steps:
 
-1) Make an /lg folder in your Apache document root and copy lg files
+1) Copy the looking glass files and set permissions.
+
+   Use the lg.conf.sample looking glass configuration file as a start.
+	cd ${prefix}/etc/rancid
+	cp lg.conf.sample lg.conf
+
+   Make an /lg folder in your Apache document root and copy lg files
 	sudo mkdir -p <Apache-directory>/lg/log
 	cd <Apache-directory>/lg
 	sudo cp ${prefix}/share/rancid/index.html ./
 	sudo cp ${prefix}/share/rancid/lgnotes.html ./
 
-   Then the .cgi's
+   Copy the .cgi's to the Apache document root
 	cp ${prefix}/libexec/rancid/lg.cgi      ./
 	cp ${prefix}/libexec/rancid/lgform.cgi  ./
 
-   Finally, set permissions.  The rancid-user should also be the Apache user.
+   Set the file permissions.  The rancid-user should also be the Apache user.
 	sudo chown -R <rancid-user>:<rancid-user> <Apache-directory>/lg
 
 
@@ -93,10 +92,6 @@
 	</Directory>
 
 
-3) Customize the ${prefix}/etc/rancid/lg.conf looking glass configuration
-   file if desired.
-
-
-4) Goto url http://localhost/lg with a web browser to use the looking glass.
+3) Goto url http://localhost/lg with a web browser to use the looking glass.
 \n"
 }

Added: trunk/dports/net/rancid/files/patch-etc-Makefile.in
===================================================================
--- trunk/dports/net/rancid/files/patch-etc-Makefile.in	                        (rev 0)
+++ trunk/dports/net/rancid/files/patch-etc-Makefile.in	2008-10-28 18:47:42 UTC (rev 41226)
@@ -0,0 +1,29 @@
+--- etc/Makefile.in.org	2007-01-13 13:56:24.000000000 -0800
++++ etc/Makefile.in	2008-10-28 11:26:08.000000000 -0700
+@@ -376,24 +376,8 @@
+ 
+ install-data-local: all
+ 	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
+-	fi; \
+-	if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
+-	    echo ""; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
+-	    echo "         *** examples."; \
+-	    echo ""; \
+-	else \
+-	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
+-	fi; \
++	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf.sample; \
++	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf.sample; \
+ 	fi
+ 
+ lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081028/bca8e817/attachment.html>