Attachment 39167 Details for Bug 61820 – file.diff

[patch] file.diff

file.diff (text/plain), 11.21 KB, created by Dean Hollister on 2004-01-24 05:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Hollister

Created: 2004-01-24 05:50:16 UTC

Size: 11.21 KB

patch

obsolete

>diff -ruN firedns.orig/Makefile firedns/Makefile
>--- firedns.orig/Makefile	Tue Nov 11 19:37:19 2003
>+++ firedns/Makefile	Sat Jan 24 13:42:55 2004
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	firedns
>-PORTVERSION=	0.1.30
>+PORTVERSION=	0.9.7
> CATEGORIES=	dns devel
>-MASTER_SITES=	http://www.wa.apana.org.au/~dean/sources/ \
>+MASTER_SITES=	http://firestuff.org/projects/ \
>+		http://www.wa.apana.org.au/~dean/sources/ \
> 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
> DISTNAME=	${PORTNAME}
> EXTRACT_SUFX=	-${PORTVERSION}.tar.gz
>@@ -22,18 +23,20 @@
> INSTALLS_SHLIB=	yes
> USE_REINPLACE=	yes
> 
>-MAN3=		firedns_aton4.3 firedns_aton6.3 firedns_dnsbl_lookup.3 \
>-		firedns_getip4.3 firedns_getip6.3 firedns_getmx.3 \
>-		firedns_getname4.3 firedns_getname6.3 \
>-		firedns_getresult.3 firedns_gettxt.3 firedns_ntoa4.3 \
>+MAN3=		firedns_aton4.3 firedns_aton6.3 \
>+		firedns_dnsbl_lookup.3 firedns_getip4.3 \
>+		firedns_getip6.3 firedns_getmx.3 \
>+		firedns_getmxlist.3 firedns_getname4.3 \
>+		firedns_getname6.3 firedns_getresult.3 \
>+		firedns_gettxt.3 firedns_ntoa4.3 \
> 		firedns_ntoa6.3 firedns_resolveip4.3 \
>-		firedns_resolveip6.3  firedns_resolvemx.3 \
>-		firedns_resolvename4.3 firedns_resolvename6.3 \
>-		firedns_resolvetxt.3 libfiredns.3
>+		firedns_resolveip6.3 firedns_resolvemx.3 \
>+		firedns_resolvemxlist.3 firedns_resolvename4.3 \
>+		firedns_resolvename6.3 firedns_resolvetxt.3 \
>+		libfiredns.3
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>-		${WRKSRC}/firemake.cflags ${WRKSRC}/firemake.ldflags
>+	${RM} ${WRKSRC}/firemake/*.orig
> 
> post-install:
> 	@cd ${PREFIX}/lib; ${MV} libfiredns.so libfiredns.so.0; \
>diff -ruN firedns.orig/distinfo firedns/distinfo
>--- firedns.orig/distinfo	Sat Nov  9 08:37:57 2002
>+++ firedns/distinfo	Sat Jan 24 13:19:59 2004
>@@ -1 +1 @@
>-MD5 (firedns-0.1.30.tar.gz) = 0e18e14615036555183ee01b43fffd3c
>+MD5 (firedns-0.9.7.tar.gz) = dd6fbf0e3a5fbdf5761c7139987d7657
>diff -ruN firedns.orig/files/patch-binaries firedns/files/patch-binaries
>--- firedns.orig/files/patch-binaries	Thu Jan  1 08:00:00 1970
>+++ firedns/files/patch-binaries	Sat Jan 24 13:29:37 2004
>@@ -0,0 +1,26 @@
>+--- firemake/binaries.orig	Sat Jan 24 12:56:05 2004
>++++ firemake/binaries	Sat Jan 24 12:57:04 2004
>+@@ -52,9 +52,9 @@
>+ 				disp "	skipping $BINARY"
>+ 			else
>+ 				dispn "	$BINARY..."
>+-				$ECHO "	$INSTALL $BINARY \$(BINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
>++				$ECHO "	$INSTALL $BINARY \$(PREFIX)/bin $INSTALL_USER $INSTALL_GROUP 0755"
>+ 				if test "$STRIP" != ""; then
>+-					$ECHO "	$STRIP \$(BINDIR)/$BINARY"
>++					$ECHO "	$STRIP \$(PREFIX)/bin/$BINARY"
>+ 				fi
>+ 				disp "done"
>+ 			fi
>+@@ -65,9 +65,9 @@
>+ 				disp "	skipping $BINARY"
>+ 			else
>+ 				dispn "	$BINARY..."
>+-				$ECHO "	$INSTALL $BINARY \$(SBINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
>++				$ECHO "	$INSTALL $BINARY \$(PREFIX)/sbin $INSTALL_USER $INSTALL_GROUP 0755"
>+ 				if test "$STRIP" != ""; then
>+-					$ECHO "	$STRIP \$(SBINDIR)/$BINARY"
>++					$ECHO "	$STRIP \$(PREFIX)/sbin/$BINARY"
>+ 				fi
>+ 				disp "done"
>+ 			fi
>diff -ruN firedns.orig/files/patch-configure firedns/files/patch-configure
>--- firedns.orig/files/patch-configure	Sat Nov  9 08:37:57 2002
>+++ firedns/files/patch-configure	Thu Jan  1 08:00:00 1970
>@@ -1,78 +0,0 @@
>---- configure.orig	Thu Oct 31 09:47:26 2002
>-+++ configure	Thu Oct 31 10:30:36 2002
>-@@ -534,33 +534,33 @@
>- 
>- $ECHO -n "	adding rule to install binaries..."
>- $ECHO "install-binaries: $BINARIES" >> Makefile
>--$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
>-+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
>- $ECHO "done"
>- for BINARY in $BINARIES; do
>- 	$ECHO -n "	adding rule to install binary $BINARY..."
>--	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile
>-+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile
>- 	$ECHO "done"
>- done;
>- $ECHO >> Makefile
>- 
>- $ECHO -n "	adding rule to install static libraries..."
>- $ECHO "install-static: $STATIC" >> Makefile
>--$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
>-+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
>- $ECHO "done"
>- for LIBRARY in $STATIC; do
>- 	$ECHO -n "	adding rule to install static library $LIBRARY..."
>--	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
>-+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
>- 	$ECHO "done"
>- done;
>- $ECHO >> Makefile
>- 
>- $ECHO -n "	adding rule to install shared libraries..."
>- $ECHO "install-shared: $STATIC" >> Makefile
>--$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
>-+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
>- $ECHO "done"
>- for LIBRARY in $SHARED; do
>- 	$ECHO -n "	adding rule to install shared library $LIBRARY..."
>--	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
>-+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
>- 	$ECHO "done"
>- done;
>- $ECHO >> Makefile
>-@@ -577,10 +577,10 @@
>- 	$ECHO "no firemake.headers found"
>- fi
>- $ECHO "install-headers: $HEADERS" >> Makefile
>--$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
>-+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
>- for HEADER in $HEADERS; do
>- 	$ECHO -n "	adding rule to install header $HEADER..."
>--	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
>-+	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
>- 	$ECHO "done"
>- done;
>- $ECHO >> Makefile
>-@@ -592,8 +592,8 @@
>- 	LS=`ls man/*.$SECTION 2>>configure.log`
>- 	if test "$LS" != ""; then
>- 		$ECHO "man/*.$SECTION" >> Makefile
>--		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile
>--		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile
>-+		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile
>-+		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile
>- 		$ECHO "done"
>- 	else
>- 		$ECHO >> Makefile
>-@@ -618,9 +618,9 @@
>- 		$ECHO -n "conf/$CONF " >> Makefile
>- 	done
>- 	$ECHO >> Makefile
>--	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
>-+	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
>- 	for CONF in $CONFS; do
>--		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile
>-+		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile
>- 	done
>- 	$ECHO "done"
>- else
>diff -ruN firedns.orig/files/patch-firemake.libs firedns/files/patch-firemake.libs
>--- firedns.orig/files/patch-firemake.libs	Sat Nov 16 06:59:19 2002
>+++ firedns/files/patch-firemake.libs	Thu Jan  1 08:00:00 1970
>@@ -1,5 +0,0 @@
>---- firemake.libs.orig	Sat Nov 16 10:00:14 2002
>-+++ firemake.libs	Sat Nov 16 10:00:23 2002
>-@@ -1 +1 @@
>---lfirestring -lpthread
>-+-lfirestring -pthread
>diff -ruN firedns.orig/files/patch-headers firedns/files/patch-headers
>--- firedns.orig/files/patch-headers	Thu Jan  1 08:00:00 1970
>+++ firedns/files/patch-headers	Sat Jan 24 13:29:49 2004
>@@ -0,0 +1,11 @@
>+--- firemake/headers.orig	Sat Jan 24 12:50:07 2004
>++++ firemake/headers	Sat Jan 24 12:50:42 2004
>+@@ -16,7 +16,7 @@
>+ 		$ECHO "install_headers:"
>+ 
>+ 		for HEADER in $HEADERS; do
>+-			$ECHO "	$INSTALL $HEADER \$(INCLUDEDIR) $INSTALL_USER $INSTALL_GROUP 0644"
>++			$ECHO "	$INSTALL $HEADER \$(PREFIX)/include $INSTALL_USER $INSTALL_GROUP 0644"
>+ 		done
>+ 		$ECHO
>+ 
>diff -ruN firedns.orig/files/patch-libraries firedns/files/patch-libraries
>--- firedns.orig/files/patch-libraries	Thu Jan  1 08:00:00 1970
>+++ firedns/files/patch-libraries	Sat Jan 24 13:30:00 2004
>@@ -0,0 +1,23 @@
>+--- firemake/libraries.orig	Sat Jan 24 12:53:09 2004
>++++ firemake/libraries	Sat Jan 24 12:54:09 2004
>+@@ -1,4 +1,4 @@
>+-#!/bin/sh
>++!/bin/sh
>+ #require prefix
>+ #require compiletest
>+ #require cflags
>+@@ -94,10 +94,10 @@
>+ 		$ECHO "install_libraries: $LIBRARYLIST"
>+ 		for LIBRARY in $LIBRARIES; do
>+ 			dispn "	$LIBRARY..."
>+-			$ECHO "	$INSTALL ${LIBRARY}.a \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
>+-			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
>+-			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so.$VERSION2"
>+-			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so"
>++			$ECHO "	$INSTALL ${LIBRARY}.a \$(PREFIX)/lib $INSTALL_USER $INSTALL_GROUP 0755"
>++			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(PREFIX)/lib $INSTALL_USER $INSTALL_GROUP 0755"
>++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(PREFIX)/lib/${LIBRARY}.so.$VERSION2"
>++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(PREFIX)/lib/${LIBRARY}.so"
>+ 			disp "done"
>+ 		done
>+ 		$ECHO
>diff -ruN firedns.orig/files/patch-man firedns/files/patch-man
>--- firedns.orig/files/patch-man	Thu Jan  1 08:00:00 1970
>+++ firedns/files/patch-man	Sat Jan 24 13:30:10 2004
>@@ -0,0 +1,56 @@
>+--- firemake/man.orig	Sat Jan 24 12:52:52 2004
>++++ firemake/man	Sat Jan 24 12:55:43 2004
>+@@ -38,7 +38,7 @@
>+ 		if test "$MAN1" != ""; then
>+ 			dispn "	Section 1..."
>+ 			for MAN in $MAN1; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man1 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man1 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>+@@ -46,7 +46,7 @@
>+ 		if test "$MAN3" != ""; then
>+ 			dispn "	Section 3..."
>+ 			for MAN in $MAN3; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man3 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man3 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>+@@ -54,7 +54,7 @@
>+ 		if test "$MAN5" != ""; then
>+ 			dispn "	Section 5..."
>+ 			for MAN in $MAN5; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man5 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man5 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>+@@ -62,7 +62,7 @@
>+ 		if test "$MAN6" != ""; then
>+ 			dispn "	Section 6..."
>+ 			for MAN in $MAN6; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man6 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man6 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>+@@ -70,7 +70,7 @@
>+ 		if test "$MAN7" != ""; then
>+ 			dispn "	Section 7..."
>+ 			for MAN in $MAN7; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man7 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man7 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>+@@ -78,7 +78,7 @@
>+ 		if test "$MAN8" != ""; then
>+ 			dispn "	Section 8..."
>+ 			for MAN in $MAN8; do
>+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man8 $INSTALL_USER $INSTALL_GROUP 0644"
>++				$ECHO "	$INSTALL $MAN \$(PREFIX)/man/man8 $INSTALL_USER $INSTALL_GROUP 0644"
>+ 			done
>+ 			disp "done"
>+ 		fi
>diff -ruN firedns.orig/pkg-plist firedns/pkg-plist
>--- firedns.orig/pkg-plist	Sat Nov  9 08:37:57 2002
>+++ firedns/pkg-plist	Sat Jan 24 13:22:23 2004
>@@ -1,8 +1,11 @@
> @comment $FreeBSD: ports/dns/firedns/pkg-plist,v 1.3 2002/11/09 00:37:57 edwin Exp $
>-include/firedns.h
>+lib/libfiredns.so.0.9
> lib/libfiredns.so
>-lib/libfiredns.so.0
> lib/libfiredns.a
>+lib/libfiredns.so.0.9.7
> bin/fdnsip
> bin/fdnstxt
> bin/fdnsname
>+bin/fdnsmxlist
>+bin/fdnsmx
>+include/firedns.h

Actions: View | Diff

Attachments on bug 61820: 39167