- Support staging

- Respect CC
- Respect CFLAGS
- Fix build with clang

2 files changed, 19 insertions, 11 deletions

diff --git a/dns/odsclient/Makefile b/dns/odsclient/Makefile
index 78b043ffd419..8d9216b16eb3 100644
--- a/dns/odsclient/Makefile
+++ b/dns/odsclient/Makefile
@@ -11,18 +11,11 @@ COMMENT=	ODS Dynamic DNS Client
 
 ALL_TARGET=	odsclient
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/odsclient ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/odsclient ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>
diff --git a/dns/odsclient/files/patch-Makefile b/dns/odsclient/files/patch-Makefile
new file mode 100644
index 000000000000..0013f01aa53e
--- /dev/null
+++ b/dns/odsclient/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- ./Makefile.orig	2014-02-19 13:17:44.470074950 +0100
++++ ./Makefile	2014-02-19 13:18:23.437075941 +0100
+@@ -1,10 +1,9 @@
+-CC=gcc -Wall
+-CFLAGS=-O2
++CC?=gcc
+ DNSLIB=#-lresolv
+ OBJS=client.o memmem.o vasprintf.o socket.o
+ 
+ odsclient: $(OBJS)
+-	$(CC) -o odsclient $(OBJS) $(DNSLIB)
++	$(CC) $(CFLAGS) -o odsclient $(OBJS) $(DNSLIB)
+ 
+ clean:
+ 	rm -rf $(OBJS) odsclient *~