8 files changed, 52 insertions, 113 deletions

diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile
index 4ae0b08aeedf..92d23243261c 100644
--- a/dns/firedns/Makefile
+++ b/dns/firedns/Makefile
@@ -6,12 +6,11 @@
 #
 
 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
 
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	A C library for handling asynchronous DNS queries
@@ -19,24 +18,24 @@ COMMENT=	A C library for handling asynchronous DNS queries
 BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	PREFIX="${PREFIX}"
 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 \
-		firedns_ntoa6.3 firedns_resolveip4.3 \
-		firedns_resolveip6.3  firedns_resolvemx.3 \
-		firedns_resolvename4.3 firedns_resolvename6.3 \
-		firedns_resolvetxt.3 libfiredns.3
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/firemake.cflags ${WRKSRC}/firemake.ldflags
+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_resolvemxlist.3 firedns_resolvename4.3 \
+		firedns_resolvename6.3 firedns_resolvetxt.3 \
+		libfiredns.3
 
-post-install:
-	@cd ${PREFIX}/lib; ${MV} libfiredns.so libfiredns.so.0; \
-	${LN} -s libfiredns.so.0 libfiredns.so
+pre-configure:
+	@-${RM} ${WRKSRC}/firemake/*.orig
 
 .include <bsd.port.mk>
diff --git a/dns/firedns/distinfo b/dns/firedns/distinfo
index b453abf7ff97..ca7cd062203b 100644
--- a/dns/firedns/distinfo
+++ b/dns/firedns/distinfo
@@ -1 +1,2 @@
-MD5 (firedns-0.1.30.tar.gz) = 0e18e14615036555183ee01b43fffd3c
+MD5 (firedns-0.9.7.tar.gz) = dd6fbf0e3a5fbdf5761c7139987d7657
+SIZE (firedns-0.9.7.tar.gz) = 91920
diff --git a/dns/firedns/files/patch-configure b/dns/firedns/files/patch-configure
deleted file mode 100644
index 14470444fc3a..000000000000
--- a/dns/firedns/files/patch-configure
+++ /dev/null
@@ -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 --git a/dns/firedns/files/patch-firemake.libs b/dns/firedns/files/patch-firemake.libs
deleted file mode 100644
index f7ce4883e183..000000000000
--- a/dns/firedns/files/patch-firemake.libs
+++ /dev/null
@@ -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 --git a/dns/firedns/files/patch-firemake_libraries b/dns/firedns/files/patch-firemake_libraries
new file mode 100644
index 000000000000..8ffab13db2d6
--- /dev/null
+++ b/dns/firedns/files/patch-firemake_libraries
@@ -0,0 +1,11 @@
+--- firemake/libraries.orig	Tue Jan 27 02:20:13 2004
++++ firemake/libraries	Tue Jan 27 02:20:35 2004
+@@ -96,7 +96,7 @@ case $PHASE in
+ 			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.0"
+ 			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so"
+ 			disp "done"
+ 		done
diff --git a/dns/firedns/files/patch-firemake_makefiletop b/dns/firedns/files/patch-firemake_makefiletop
new file mode 100644
index 000000000000..4c81690cf9bb
--- /dev/null
+++ b/dns/firedns/files/patch-firemake_makefiletop
@@ -0,0 +1,11 @@
+--- firemake/makefiletop.orig	Tue Jan 27 02:16:48 2004
++++ firemake/makefiletop	Tue Jan 27 02:16:58 2004
+@@ -3,7 +3,7 @@
+ #require make
+ #phase makefile
+ dispn "Writing Makefile top entries..."
+-if test "$MAKE_CONDSET" = "y"; then
++if test "$MAKE_CONDSET" = "never"; then
+ 	$ECHO "PREFIX ?= $FM_PREFIX"
+ 
+ 	if test "$FM_MANDIRSTRICT" = "y"; then
diff --git a/dns/firedns/pkg-descr b/dns/firedns/pkg-descr
index 5e0d9ebe9c66..a09bd01bf63d 100644
--- a/dns/firedns/pkg-descr
+++ b/dns/firedns/pkg-descr
@@ -1,16 +1,13 @@
-From libfiredns(3):
-
-"libfiredns is a library for handling asynchronous DNS
+libfiredns is a library for handling asynchronous DNS
 requests.  It provides a very simple interface for sending
 requests and parsing reponses, as well as low-timeout
 blocking functions.  It can also be compiled to override
 the BIND/LIBC functions with its alternative implementations.
 libfiredns functions have much lower timeouts than the stock
 functions and tend to be faster because they send requests
-to all configured system nameservers at the same time."
+to all configured system nameservers at the same time.
 
-WWW: http://ares.penguinhosting.net/~ian/
+WWW:	http://ares.penguinhosting.net/~ian/
 
 - Dean
-
 dean@odyssey.apana.org.au
diff --git a/dns/firedns/pkg-plist b/dns/firedns/pkg-plist
index 7aceb28be2c0..cdc35b1bc685 100644
--- a/dns/firedns/pkg-plist
+++ b/dns/firedns/pkg-plist
@@ -1,8 +1,11 @@
 @comment $FreeBSD$
+bin/fdnsip
+bin/fdnsmx
+bin/fdnsmxlist
+bin/fdnsname
+bin/fdnstxt
 include/firedns.h
+lib/libfiredns.a
 lib/libfiredns.so
 lib/libfiredns.so.0
-lib/libfiredns.a
-bin/fdnsip
-bin/fdnstxt
-bin/fdnsname
+lib/libfiredns.so.0.9.7