Attachment 29964 Details for Bug 50668 – mydns.diff

[patch] mydns.diff

mydns.diff (text/plain), 7.38 KB, created by Alex Dupre on 2003-04-07 11:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2003-04-07 11:30:22 UTC

Size: 7.38 KB

patch

obsolete

>diff -ruN mydns.orig/Makefile mydns/Makefile
>--- mydns.orig/Makefile	Fri Mar 28 11:03:59 2003
>+++ mydns/Makefile	Mon Apr  7 12:20:51 2003
>@@ -6,15 +6,19 @@
> #
> 
> PORTNAME=	mydns
>-PORTVERSION=	0.9.7
>+PORTVERSION=	0.9.9
> CATEGORIES=	net databases
> MASTER_SITES=	http://mydns.bboy.net/download/
> 
> MAINTAINER=	simond@irrelevant.org
> COMMENT=	DNS server designed to utilize the MySQL database
> 
>+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
>+		iconv.3:${PORTSDIR}/converters/libiconv
>+
>+USE_LIBTOOL=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--with-confdir=${PREFIX}/etc --without-libiconv-prefix
>+CONFIGURE_ARGS+=--with-confdir=${PREFIX}/etc
> USE_BZIP2=	yes
> USE_REINPLACE=	yes
> 
>@@ -23,43 +27,38 @@
> 
> DOCS=	AUTHORS COPYING ChangeLog NEWS QUICKSTART README TODO
> 
>+PKGMESSAGE=	${WRKDIR}/pkg-message
>+
> .include <bsd.port.pre.mk>
> 
>-.if defined (WITH_PGSQL)
>-LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
>+.if defined(WITH_PGSQL)
>+LIB_DEPENDS=	pq.3:${PORTSDIR}/databases/postgresql7
> CONFIGURE_ARGS+=	--without-mysql
>-PKGNAMESUFFIX=		-pg
> .else
>-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
>-CONFIGURE_ARGS+=	--without-pgsql
>-PKGNAMESUFFIX=		-mysql
>-.endif
>-
>-.if !defined(NOPORTDOCS)
>-USE_PERL5=	yes
>+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
>+LIB_DEPENDS=    mysqlclient.10:${PORTSDIR}/databases/mysql323-client
> .else
>-pre-configure:
>-	@${REINPLACE_CMD} -E -e "s|^(all: vars manpages info) html-doc|\1|" \
>-		${WRKSRC}/doc/Makefile.in
>+LIB_DEPENDS=	mysqlclient.12:${PORTSDIR}/databases/mysql40-client
>+.endif
>+CONFIGURE_ARGS+=	--without-pgsql
> .endif
>-
>-post-build:
>-	cd ${WRKSRC}/doc && ${MAKE} html
> 
> post-install:
>-	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh > ${WRKSRC}/mydns.sh
>-	@${INSTALL_SCRIPT} ${WRKSRC}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
>+	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh \
>+		> ${WRKDIR}/mydns.sh
>+	@${INSTALL_SCRIPT} ${WRKDIR}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
> 	@install-info ${PREFIX}/info/mydns.info ${PREFIX}/info/dir
> .if !defined(NOPORTDOCS)
>-	@${INSTALL} -d -m 0755 ${DOCSDIR}/html ${DOCSDIR}/contrib
>+	@${MKDIR} ${DOCSDIR}/contrib
> .for f in ${DOCS}
> 	        @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
> .endfor
>-	@${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}/html/
> 	@${INSTALL_DATA} ${WRKSRC}/contrib/admin.php ${DOCSDIR}/contrib/
> 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/
> .endif
>-	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
>-	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
>+	@${PREFIX}/sbin/mydns --dump-config > ${PREFIX}/etc/mydns.conf.sample
>+	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' ${.CURDIR}/pkg-message \
>+		> ${PKGMESSAGE}
>+	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.post.mk>
>diff -ruN mydns.orig/distinfo mydns/distinfo
>--- mydns.orig/distinfo	Fri Mar 28 11:03:59 2003
>+++ mydns/distinfo	Mon Apr  7 12:21:11 2003
>@@ -1 +1 @@
>-MD5 (mydns-0.9.7.tar.bz2) = aa41668f642b059eba7588200a38f1ee
>+MD5 (mydns-0.9.9.tar.bz2) = 3eae2e08ddf0434a5bb969945ffe00c6
>diff -ruN mydns.orig/files/patch-configure mydns/files/patch-configure
>--- mydns.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
>+++ mydns/files/patch-configure	Mon Apr  7 12:20:34 2003
>@@ -0,0 +1,10 @@
>+--- configure.orig	Fri Mar 28 11:51:06 2003
>++++ configure	Fri Mar 28 11:51:21 2003
>+@@ -7803,6 +7803,7 @@
>+ 
>+ # This can be used to rebuild libtool when needed
>+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++/usr/local/share/libtool/ltconfig $LIBTOOL_DEPS
>+ 
>+ # Always use our own libtool.
>+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>diff -ruN mydns.orig/files/patch-doc::texinfo::title.texi mydns/files/patch-doc::texinfo::title.texi
>--- mydns.orig/files/patch-doc::texinfo::title.texi	Thu Jan  1 01:00:00 1970
>+++ mydns/files/patch-doc::texinfo::title.texi	Mon Apr  7 12:20:34 2003
>@@ -0,0 +1,10 @@
>+--- doc/texinfo/title.texi.orig	Fri Nov 15 10:30:48 2002
>++++ doc/texinfo/title.texi	Wed Dec 18 15:18:13 2002
>+@@ -1,3 +1,7 @@
>++@dircategory Miscellaneous
>++@direntry
>++* mydns: (mydns).               The MySQL based DNS-server.
>++@end direntry
>+ 
>+ @ifinfo
>+ This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}),
>diff -ruN mydns.orig/files/patch-title.texi mydns/files/patch-title.texi
>--- mydns.orig/files/patch-title.texi	Fri Mar 28 11:03:59 2003
>+++ mydns/files/patch-title.texi	Thu Jan  1 01:00:00 1970
>@@ -1,10 +0,0 @@
>---- doc/texi/en/title.texi.orig	Fri Nov 15 10:30:48 2002
>-+++ doc/texi/en/title.texi	Wed Dec 18 15:18:13 2002
>-@@ -1,3 +1,7 @@
>-+@dircategory Miscellaneous
>-+@direntry
>-+* mydns: (mydns).               The MySQL based DNS-server.
>-+@end direntry
>- 
>- @ifinfo
>- This is the manual for MyDNS (version @value{PKGVERSION}, @value{PKGDATE}),
>diff -ruN mydns.orig/pkg-plist mydns/pkg-plist
>--- mydns.orig/pkg-plist	Fri Mar 28 11:03:59 2003
>+++ mydns/pkg-plist	Mon Apr  7 12:20:34 2003
>@@ -1,15 +1,15 @@
>+bin/mydnscheck
>+bin/mydnsexport
>+bin/mydnsimport
> etc/mydns.conf.sample
> etc/rc.d/mydns.sh.sample
> @unexec install-info --delete %D/info/mydns.info %D/info/dir
> info/mydns.info
> @exec install-info %D/info/mydns.info %D/info/dir
>-bin/mydnscheck
>-bin/mydnsexport
>-bin/mydnsimport
>+sbin/mydns
> share/locale/es/LC_MESSAGES/mydns.mo
>-share/locale/pt_BR/LC_MESSAGES/mydns.mo
> share/locale/fr/LC_MESSAGES/mydns.mo
>-sbin/mydns
>+share/locale/pt_BR/LC_MESSAGES/mydns.mo
> %%PORTDOCS%%share/doc/mydns/AUTHORS
> %%PORTDOCS%%share/doc/mydns/COPYING
> %%PORTDOCS%%share/doc/mydns/ChangeLog
>@@ -19,41 +19,5 @@
> %%PORTDOCS%%share/doc/mydns/TODO
> %%PORTDOCS%%share/doc/mydns/contrib/README
> %%PORTDOCS%%share/doc/mydns/contrib/admin.php
>-%%PORTDOCS%%share/doc/mydns/html/Building-the-source.html
>-%%PORTDOCS%%share/doc/mydns/html/Cache-options.html
>-%%PORTDOCS%%share/doc/mydns/html/Caching.html
>-%%PORTDOCS%%share/doc/mydns/html/Configuration.html
>-%%PORTDOCS%%share/doc/mydns/html/Creating-mydns.conf.html
>-%%PORTDOCS%%share/doc/mydns/html/Database-options.html
>-%%PORTDOCS%%share/doc/mydns/html/Database.html
>-%%PORTDOCS%%share/doc/mydns/html/GNU-Free-Documentation-License.html
>-%%PORTDOCS%%share/doc/mydns/html/General-options.html
>-%%PORTDOCS%%share/doc/mydns/html/Index.html
>-%%PORTDOCS%%share/doc/mydns/html/Installation.html
>-%%PORTDOCS%%share/doc/mydns/html/Introduction.html
>-%%PORTDOCS%%share/doc/mydns/html/Load-balancing.html
>-%%PORTDOCS%%share/doc/mydns/html/Misc-options.html
>-%%PORTDOCS%%share/doc/mydns/html/Optional-columns.html
>-%%PORTDOCS%%share/doc/mydns/html/Preparing-the-database.html
>-%%PORTDOCS%%share/doc/mydns/html/RFC-1034.html
>-%%PORTDOCS%%share/doc/mydns/html/References.html
>-%%PORTDOCS%%share/doc/mydns/html/Round-robin.html
>-%%PORTDOCS%%share/doc/mydns/html/Server.html
>-%%PORTDOCS%%share/doc/mydns/html/Signals.html
>-%%PORTDOCS%%share/doc/mydns/html/TCP-support.html
>-%%PORTDOCS%%share/doc/mydns/html/Troubleshooting.html
>-%%PORTDOCS%%share/doc/mydns/html/Utilities.html
>-%%PORTDOCS%%share/doc/mydns/html/Zone-transfers.html
>-%%PORTDOCS%%share/doc/mydns/html/any.active.html
>-%%PORTDOCS%%share/doc/mydns/html/in-addr.arpa.html
>-%%PORTDOCS%%share/doc/mydns/html/index.html
>-%%PORTDOCS%%share/doc/mydns/html/mydnscheck.html
>-%%PORTDOCS%%share/doc/mydns/html/mydnsexport.html
>-%%PORTDOCS%%share/doc/mydns/html/mydnsimport.html
>-%%PORTDOCS%%share/doc/mydns/html/ptr-table.html
>-%%PORTDOCS%%share/doc/mydns/html/rr-table.html
>-%%PORTDOCS%%share/doc/mydns/html/soa-table.html
>-%%PORTDOCS%%share/doc/mydns/html/soa.xfer.html
>-%%PORTDOCS%%@dirrm share/doc/mydns/html
> %%PORTDOCS%%@dirrm share/doc/mydns/contrib
> %%PORTDOCS%%@dirrm share/doc/mydns

Actions: View | Diff

Attachments on bug 50668: 29964