===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/Makefile /usr/ports/dns/mydns-ng/Makefile --- /usr/ports/dns/mydns-ng-mysql/Makefile 2008-06-06 21:22:59.000000000 +0800 +++ /usr/ports/dns/mydns-ng/Makefile 2009-03-23 17:58:01.000000000 +0800 @@ -5,21 +5,24 @@ # $FreeBSD: ports/dns/mydns/Makefile,v 1.44 2008/06/06 13:22:59 edwin Exp $ # -PORTNAME= mydns -PORTVERSION= 1.1.0 -PORTREVISION= 3 +PORTNAME= mydns-ng +PATCHLEVEL= 26 +DISTVERSION= 1.2.8 +PORTVERSION= ${DISTVERSION}.${PATCHLEVEL} CATEGORIES= dns databases -MASTER_SITES= http://mydns.bboy.net/download/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= mydns-ng +DISTNAME= mydns-${PORTVERSION} -MAINTAINER= ale@FreeBSD.org -COMMENT= DNS server designed to utilize the MySQL database +MAINTAINER= gaod@hychen.org +COMMENT= A Next Generation DNS Server for fast and scalable sql based DNS services. +WRKSRC= ${WRKDIR}/mydns-${DISTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc USE_ICONV= yes -USE_BZIP2= yes -USE_RC_SUBR= mydns.sh +USE_RC_SUBR= mydns SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -30,6 +33,14 @@ DOCS= AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO + +OPTIONS= PGSQL "Build with PostgreSQL backend instead of MySQL" OFF \ + ALIAS "Enable server side aliases" ON \ + OPENSSL "Enable OpenSSL (if MySQL is linked with OpenSSL)" OFF \ + NLS "Native Language Support with gettext" OFF + +.include + .if defined(WITH_ALIAS) CONFIGURE_ARGS+=--enable-alias .endif @@ -46,7 +57,7 @@ CONFIGURE_ARGS+=--without-mysql \ --with-pgsql-include=${LOCALBASE}/include \ --with-pgsql-lib=${LOCALBASE}/lib -PKGNAMESUFFIX= -pg +PKGNAMESUFFIX= -pgsql .else CONFIGURE_ARGS+=--without-pgsql \ --with-mysql-include=${LOCALBASE}/include/mysql \ @@ -55,23 +66,16 @@ USE_MYSQL= yes .endif -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -PLIST_SUB+= NLS="" + +.if defined(WITH_NLS) +CONFIGURE_ARGS+=--with-included-gettext +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " +PLIST_SUB+= NLS="@comment " .endif -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " WITH_PGSQL=yes Build with PostgreSQL support" - @${ECHO} " WITH_ALIAS=yes Enable server side aliases" - @${ECHO} " WITH_OPENSSL=yes Enable OpenSSL (needed if MySQL is linked with OpenSSL)" - @${ECHO} "" - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/contrib @@ -86,4 +90,4 @@ @${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample @${CAT} ${PKGMESSAGE} -.include +.include diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/distinfo /usr/ports/dns/mydns-ng/distinfo --- /usr/ports/dns/mydns-ng-mysql/distinfo 2006-02-09 22:04:42.000000000 +0800 +++ /usr/ports/dns/mydns-ng/distinfo 2009-03-22 04:54:39.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (mydns-1.1.0.tar.bz2) = c613a14686f08486d444cee2d68f9c87 -SHA256 (mydns-1.1.0.tar.bz2) = ecfcc8bb8fd9f707d2e7af808317cdcc3a4d701375265840944c4e0ff0d66bf6 -SIZE (mydns-1.1.0.tar.bz2) = 573261 +MD5 (mydns-1.2.8.26.tar.gz) = c10cc0299accd47b85611b7ad07c2b5e +SHA256 (mydns-1.2.8.26.tar.gz) = 99d75606cc9a1d38ea8cdcc1932dd4e488ba4e2d362186db4b68ea66fe5c4e23 +SIZE (mydns-1.2.8.26.tar.gz) = 1054239 diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/files/mydns.in /usr/ports/dns/mydns-ng/files/mydns.in --- /usr/ports/dns/mydns-ng-mysql/files/mydns.in 1970-01-01 08:00:00.000000000 +0800 +++ /usr/ports/dns/mydns-ng/files/mydns.in 2009-03-22 04:48:41.000000000 +0800 @@ -0,0 +1,30 @@ +#!/bin/sh +# +# $FreeBSD: ports/dns/mydns/files/mydns.sh.in,v 1.2 2006/03/07 16:27:27 ale Exp $ +# + +# PROVIDE: mydns +# REQUIRE: DAEMON mysql postgresql +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mydns: +# mydns_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MyDNS. +# + +. %%RC_SUBR%% + +name="mydns" +rcvar=`set_rcvar` + +load_rc_config $name + +: ${mydns_enable="NO"} + +command="%%PREFIX%%/sbin/mydns" +command_args="-b" +pidfile="/var/run/mydns.pid" +required_files="%%PREFIX%%/etc/mydns.conf" + +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/files/mydns.sh.in /usr/ports/dns/mydns-ng/files/mydns.sh.in --- /usr/ports/dns/mydns-ng-mysql/files/mydns.sh.in 2006-03-08 00:27:27.000000000 +0800 +++ /usr/ports/dns/mydns-ng/files/mydns.sh.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/dns/mydns/files/mydns.sh.in,v 1.2 2006/03/07 16:27:27 ale Exp $ -# - -# PROVIDE: mydns -# REQUIRE: DAEMON mysql postgresql -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mydns: -# mydns_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MyDNS. -# - -. %%RC_SUBR%% - -name="mydns" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mydns_enable="NO"} - -command="%%PREFIX%%/sbin/mydns" -command_args="-b" -pidfile="/var/run/mydns.pid" -required_files="%%PREFIX%%/etc/mydns.conf" - -run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/files/patch-Makefile.in /usr/ports/dns/mydns-ng/files/patch-Makefile.in --- /usr/ports/dns/mydns-ng-mysql/files/patch-Makefile.in 2003-01-04 02:57:59.000000000 +0800 +++ /usr/ports/dns/mydns-ng/files/patch-Makefile.in 2009-03-22 05:03:07.000000000 +0800 @@ -1,10 +1,10 @@ ---- Makefile.in.orig Wed Dec 18 15:16:33 2002 -+++ Makefile.in Wed Dec 18 15:16:43 2002 -@@ -529,7 +529,6 @@ +--- Makefile.in.orig 2009-03-22 05:02:50.000000000 +0800 ++++ Makefile.in 2009-03-22 05:02:56.000000000 +0800 +@@ -637,7 +637,6 @@ install-data-am: @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-exec-am: + install-dvi: install-dvi-recursive diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/files/patch-src_mydns_recursive.c /usr/ports/dns/mydns-ng/files/patch-src_mydns_recursive.c --- /usr/ports/dns/mydns-ng-mysql/files/patch-src_mydns_recursive.c 2007-04-30 15:33:13.000000000 +0800 +++ /usr/ports/dns/mydns-ng/files/patch-src_mydns_recursive.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,12 +0,0 @@ ---- src/mydns/recursive.c.orig Mon Apr 30 08:17:52 2007 -+++ src/mydns/recursive.c Mon Apr 30 08:22:13 2007 -@@ -109,8 +109,7 @@ - #endif - - /* Send to remote server */ -- if ((rv = sendto(t->recursive_fd, query, querylen, 0, -- (struct sockaddr *)&recursive_sa, sizeof(struct sockaddr_in))) != querylen) -+ if ((rv = send(t->recursive_fd, query, querylen, 0)) != querylen) - { - if (errno == EAGAIN) - { diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/files/pkg-message.in /usr/ports/dns/mydns-ng/files/pkg-message.in --- /usr/ports/dns/mydns-ng-mysql/files/pkg-message.in 2005-03-09 00:27:45.000000000 +0800 +++ /usr/ports/dns/mydns-ng/files/pkg-message.in 2009-03-23 17:44:55.000000000 +0800 @@ -11,4 +11,11 @@ mydns_enable="YES" into your rc.conf. + +You can use %%PORTDOCS%%%%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. + ********************************************************************* diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/pkg-descr /usr/ports/dns/mydns-ng/pkg-descr --- /usr/ports/dns/mydns-ng-mysql/pkg-descr 2004-01-18 18:50:12.000000000 +0800 +++ /usr/ports/dns/mydns-ng/pkg-descr 2009-03-23 17:44:21.000000000 +0800 @@ -1,15 +1,16 @@ -MyDNS is a free DNS server for UNIX implemented from scratch and -designed to utilize the MySQL database for data storage. +MyDNS - SQL-based DNS server -Its primary objectives are stability, security, interoperability, -and speed, though not necessarily in that order. +This is the MyDNS package. MyDNS is a simple, non-recursive Internet +name daemon which serves records directly from an SQL database. It +currently works with either MySQL or PostgreSQL. -MyDNS does not include recursive name service, nor a resolver library. -It is primarily designed for organizations with many zones and/or -resource records who desire the ability to perform real-time dynamic -updates on their DNS data via MySQL. +This version of the MyDNS package is a development of the original one +produced by Don Moore. -WWW: http://mydns.bboy.net/ +This project homepage on the WWW at the following URL: -- Alex Dupre -ale@FreeBSD.org + http://sourceforge.net/projects/mydns-ng/ + + +- 12-May-2004 Don Moore +- 23-January-2009 Howard Wilkinsin diff -ruN --exclude=CVS /usr/ports/dns/mydns-ng-mysql/pkg-plist /usr/ports/dns/mydns-ng/pkg-plist --- /usr/ports/dns/mydns-ng-mysql/pkg-plist 2006-02-09 22:04:42.000000000 +0800 +++ /usr/ports/dns/mydns-ng/pkg-plist 2009-03-23 07:04:55.000000000 +0800 @@ -5,9 +5,6 @@ bin/mydnsptrconvert etc/mydns.conf.sample sbin/mydns -%%NLS%%share/locale/es/LC_MESSAGES/mydns.mo -%%NLS%%share/locale/fr/LC_MESSAGES/mydns.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/mydns.mo %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -20,6 +17,11 @@ %%PORTDOCS%%%%DOCSDIR%%/contrib/README %%PORTDOCS%%%%DOCSDIR%%/contrib/admin.php %%PORTDOCS%%%%DOCSDIR%%/contrib/create_domain.pl +%%PORTDOCS%%%%DOCSDIR%%/contrib/fix_rr_serial.pl %%PORTDOCS%%%%DOCSDIR%%/contrib/stats.php +%%NLS%%share/locale/es/LC_MESSAGES/mydns.mo +%%NLS%%share/locale/fr/LC_MESSAGES/mydns.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/mydns.mo %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib %%PORTDOCS%%@dirrm %%DOCSDIR%% + ===> Done