2 files changed, 7 insertions, 45 deletions

diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index 45c0b587c238..38b309bab8da 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -15,10 +15,11 @@ COMMENT=	DHIS client for updating dynamic DNS entries in dhisd DNS tables
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-LDFLAGS+=	-L${PREFIX}/lib
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
+MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DQRC=1" \
+		LFLAGS="-L${LOCALBASE}/lib"
 
-DOCFILES=	AUTHORS CONTRIBUTORS COPYRIGHT INSTALL README WHATSNEW
+PORTDOCS=	AUTHORS CONTRIBUTORS COPYRIGHT INSTALL README WHATSNEW
+PLIST_FILES=	sbin/dhid bin/genkeys etc/dhid.conf.sample etc/rc.d/dhid.sh.sample
 USE_REINPLACE=	yes
 
 DHID_USER=	dhis
@@ -26,24 +27,18 @@ DHID_GROUP=	dhis
 DHID_PID_DIR=	/var/run/dhis
 
 post-patch:
-	@${ECHO} "===>   Patching dhid.h and Makefile"
-	@${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h ${WRKSRC}/Makefile
+	@${ECHO} "===>   Patching dhid.h"
+	@${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	@${ECHO_MSG} "===>   Installing ${PREFIX}/sbin/dhid."
 	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
-	@${ECHO_CMD} "sbin/dhid" >> ${TMPPLIST}
-	@${ECHO_MSG} "===>   Installing ${PREFIX}/bin/genkeys."
 	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin
-	@${ECHO_CMD} "bin/genkeys" >> ${TMPPLIST}
-	@${ECHO_MSG} "===>   Installing ${PREFIX}/etc/dhid.conf.sample."
 	${INSTALL_DATA} ${WRKSRC}/dhid.conf.sample ${PREFIX}/etc/dhid.conf.sample
 	${CHOWN} ${DHID_USER}:${DHID_GROUP} ${PREFIX}/etc/dhid.conf.sample
 	${CHMOD} 0600 ${PREFIX}/etc/dhid.conf.sample
-	@${ECHO_CMD} "etc/dhid.conf.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} ${DHID_USER}:${DHID_GROUP} %D/etc/dhid.conf.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 0600 %D/etc/dhid.conf.sample" >> ${TMPPLIST}
 	${MKDIR} ${DHID_PID_DIR}
@@ -57,16 +52,9 @@ do-install:
 	@${ECHO_MSG} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh.sample startup file."
 	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhid.sh ${PREFIX}/etc/rc.d/dhid.sh.sample
 .endif
-	@${ECHO_CMD} "etc/rc.d/dhid.sh.sample" >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing documentation in ${DOCSDIR}"
 	${MKDIR} ${DOCSDIR}
-	${CHMOD} 755 ${DOCSDIR}
-.for DOCFILE in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
-	@${ECHO_CMD} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/dhid/files/patch-ab b/dns/dhid/files/patch-ab
deleted file mode 100644
index be0e9576fdec..000000000000
--- a/dns/dhid/files/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	Wed Sep 12 12:12:02 2001
-+++ Makefile	Sat Feb 19 21:19:11 2005
-@@ -29,8 +29,8 @@
- 
- # Add -lnsl and -lsocket to LIBS in SysV systems 
- #
--CFLAGS=-I/usr/local/include -DQRC=1 -Wall 
--LFLAGS=-L/usr/local/lib
-+CFLAGS=-I__PREFIX__/include -DQRC=1 -Wall
-+#LFLAGS=-L/usr/local/lib
- LIBS=-lgmp
- 
- # Use these and comment the above if you wish to compile dhid without 
-@@ -46,10 +46,10 @@
- all:	dhid genkeys
- 
- dhid:	conf.o network.o main.o
--	$(CC) $(LFLAGS) -o dhid conf.o network.o main.o $(LIBS)
-+	$(CC) $(LDFLAGS) -o dhid conf.o network.o main.o $(LIBS)
- 
- genkeys: genkeys.c
--	$(CC) $(CFLAGS) $(LFLAGS) -o genkeys genkeys.c $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o genkeys genkeys.c $(LIBS)
- 
- main.o: dhid.h main.c
- 	$(CC) $(CFLAGS) -c main.c