4 files changed, 46 insertions, 16 deletions

diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 608b80e6575f..fc47fb87602a 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -12,22 +12,16 @@ COMMENT=	Easy to use asynchronous-capable DNS client library and utilities
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
-USES=	gmake
+USES=		gmake
 
 LIBVERSION=	1
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
 
 DOCS=		COPYING GPL-vs-LGPL INSTALL LICENCE.WAIVERS README README.html TODO changelog
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/adnslogres ${PREFIX}/bin/adnshost
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/adnslogres ${STAGEDIR}${PREFIX}/bin/adnshost
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/dns/adns/files/patch-client-Makefile.in b/dns/adns/files/patch-client-Makefile.in
new file mode 100644
index 000000000000..8dfac29317cc
--- /dev/null
+++ b/dns/adns/files/patch-client-Makefile.in
@@ -0,0 +1,14 @@
+--- client/Makefile.in.orig	2006-05-10 12:58:02.000000000 +0200
++++ client/Makefile.in	2013-10-09 10:56:22.929654486 +0200
+@@ -58,9 +58,9 @@
+ all:		$(TARGETS)
+ 
+ install:	$(TARG_INSTALL)
+-		mkdir -p $(bindir)
++		mkdir -p $(DESTDIR)$(bindir)
+ 		set -xe; for f in $(TARG_INSTALL); \
+-			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
++			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
+ 
+ uninstall:
+ 		for f in $(TARGETS); do rm -f $(bindir)/$$f; done
diff --git a/dns/adns/files/patch-dynamic-Makefile.in b/dns/adns/files/patch-dynamic-Makefile.in
index 0adabb78f569..a6736b810b71 100644
--- a/dns/adns/files/patch-dynamic-Makefile.in
+++ b/dns/adns/files/patch-dynamic-Makefile.in
@@ -1,10 +1,16 @@
---- dynamic/Makefile.in.orig	Tue Jul  4 11:34:55 2006
-+++ dynamic/Makefile.in	Tue Jul  4 11:35:05 2006
-@@ -32,7 +32,6 @@
+--- dynamic/Makefile.in.orig	2006-05-10 12:58:02.000000000 +0200
++++ dynamic/Makefile.in	2013-10-09 10:55:03.235655634 +0200
+@@ -30,10 +30,9 @@
+ ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
+ 
  install:
- 		mkdir -p $(libdir)
- 		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
+-		mkdir -p $(libdir)
+-		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
 -		ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
- 		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
+-		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
++		mkdir -p $(DESTDIR)$(libdir)
++		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
++		(cd $(DESTDIR)$(libdir) && ln -sf $(SHLIBSONAME) $(SHLIBFORLINK))
  
  uninstall:
+ 		rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
diff --git a/dns/adns/files/patch-src-Makefile.in b/dns/adns/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..66a1186f60d4
--- /dev/null
+++ b/dns/adns/files/patch-src-Makefile.in
@@ -0,0 +1,16 @@
+--- src/Makefile.in.orig	2006-05-10 12:58:03.000000000 +0200
++++ src/Makefile.in	2013-10-09 10:46:18.314690101 +0200
+@@ -28,10 +28,10 @@
+ include		adns.make
+ 
+ install:
+-		mkdir -p $(libdir) $(includedir)
++		mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ 		set -xe; for f in $(TARGETS); \
+-			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
+-		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
++			do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
++		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
+ 
+ uninstall:
+ 		for f in $(TARGETS); do rm -f $(libdir)/$$f; done