ports/134967: [MAINTAINER] dns/mydns-ng: Fix for incorrect Makefile

[Hung-Yi Chen]

>Number:         134967
>Category:       ports
>Synopsis:       [MAINTAINER] dns/mydns-ng: Fix for incorrect Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 26 20:00:09 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Hung-Yi Chen
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD gaod.tfcis.org 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Wed May 13 04:52:09 CST 2009 gaod at gaod.tfcis.org:/usr/obj/usr/src/sys/gaod i386

>Description:
	- Fix for wrong configuration with NLS support in Makefile.
	- Import some patch about admin.php.
>How-To-Repeat:
>Fix:

--- mydns-ng begins here ---
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng.orig/Makefile /usr/ports/dns/mydns-ng/Makefile
--- /usr/ports/dns/mydns-ng.orig/Makefile	2009-03-29 19:56:20.000000000 +0800
+++ /usr/ports/dns/mydns-ng/Makefile	2009-05-27 11:15:38.000000000 +0800
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	mydns-ng
+PORTREVISION=	1
 PORTVERSION=	1.2.8.27
 CATEGORIES=	dns databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -63,7 +64,7 @@
 USE_MYSQL=	yes
 .endif
 
-.if defined(WITHOUT_NLS)
+.if !defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--with-included-gettext
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng.orig/files/patch-contrib_admin.php /usr/ports/dns/mydns-ng/files/patch-contrib_admin.php
--- /usr/ports/dns/mydns-ng.orig/files/patch-contrib_admin.php	1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/dns/mydns-ng/files/patch-contrib_admin.php	2009-05-27 11:14:54.000000000 +0800
@@ -0,0 +1,58 @@
+--- contrib/admin.php.orig	2009-01-30 12:21:32.000000000 +0000
++++ contrib/admin.php	2009-05-27 03:13:57.000000000 +0000
+@@ -85,6 +85,15 @@
+ */
+ $auto_update_ptr = 0;
+ 
++/*
++**  This can automatically insert the defaults w/o updating the serial
++**  number automatically.  Sometimes you want to change entries but not
++**  have the nameserver reload and start serving out new data.
++**  -bek at monsterous.com
++*/
++
++$auto_defaults = 1;
++
+ 
+ /*
+ **  If this option is nonzero, this script will not complain if the
+@@ -2052,7 +2061,7 @@
+   global $soa_use_active, $soa_use_recursive, $soa_use_xfer, $soa_use_update_acl, $soa_use_also_notify;
+   global $rr_table_name, $soa_active_types, $soa_recursive_types;
+   global $default_refresh, $default_retry, $default_expire, $default_minimum_ttl, $default_ttl;
+-  global $default_ns, $default_mbox;
++  global $default_ns, $default_mbox, $auto_defaults;
+   global $soa_bgcolor, $zonenotify;
+ 
+   $delete_confirm = 0;
+@@ -2112,6 +2121,18 @@
+     } else
+       $soa = $values = $_POST;
+     $new_soa = 1;
++
++       if ($auto_defaults == 1) {
++                        $soa['serial'] = date("Ymd01", time());
++                        $soa['refresh'] = $default_refresh;
++                        $soa['retry'] = $default_retry;
++                        $soa['expire'] = $default_expire;
++                        $soa['minimum'] = $default_minimum_ttl;
++                        $soa['ttl'] = $default_ttl;
++                        $soa['ns'] = trim($default_ns);
++                        $soa['mbox'] = trim($default_mbox);
++                        $values = $soa;
++                        }
+   }
+ 
+   /* Set 'values' vars to avoid 'undefined' errors */
+@@ -2166,8 +2187,9 @@
+ 	<TR title="The serial number for this zone.">
+ 		<TD class="soaFields"><INPUT class=mono type=text name="serial" value="<?php echo ent($values['serial'])?>" size=20>
+ 		<TD> 
+-		<TD nowrap><TT>; <B>Serial</B> (next is <?php echo next_serial(isset($soa['serial']) ? $soa['serial'] : '');?>)</TT>
+-		<TD> 
++		<TD nowrap><TT>; <B>Serial</B> (next is <?=next_serial(isset($soa['serial']) ? $soa['serial'] : '');?>)</TT>
++		<TD><input name="updateserial" class=formButton style="border-color: #FFFF99; color: #FFFF99;" type="button" value="Update Serial"onclick="javascript:document.soaform.serial.value
++			=<?=next_serial(isset($soa['serial']) ? $soa['serial'] : '');?>"> 
+ 
+ 	<TR title="The number of seconds slave nameservers will wait before updating their zone data for this zone.">
+ 		<TD class=soaFields><INPUT class=mono type=text name="refresh" value="<?php echo ent($values['refresh'])?>" size=10>
diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng.orig/files/pkg-message.in /usr/ports/dns/mydns-ng/files/pkg-message.in
--- /usr/ports/dns/mydns-ng.orig/files/pkg-message.in	2009-03-23 17:44:55.000000000 +0800
+++ /usr/ports/dns/mydns-ng/files/pkg-message.in	2009-05-27 10:42:33.000000000 +0800
@@ -12,10 +12,10 @@
 
 into your rc.conf.
 
-You can use %%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php to maintain MyDNS.
+You can use %%DOCSDIR%%/contrib/admin.php to maintain MyDNS.
 
 If you are looking for the web interface for MyDNS, it's included in
-the MyDNS distribution as %%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php.  
-See %%PORTDOCS%%%%DOCSDIR%%/contrib/README for installation instructions.
+the MyDNS distribution as %%DOCSDIR%%/contrib/admin.php.  
+See %%DOCSDIR%%/contrib/README for installation instructions.
 
 *********************************************************************
===> Done
--- mydns-ng ends here ---


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