much simplified fetching and author patching, using bsd.port.mk

general tidyup

1 files changed, 15 insertions, 45 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index f1855e5f0a12..6d677d0d13f7 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -6,62 +6,32 @@
 
 DISTNAME=	dgd-1.0.9
 DISTFILES=	${DISTNAME}.tar.gz
+PATCHFILES=	1.0.9-1.0.9.1.gz
+MASTER_SITES=	epsilon.me.chalmers.se:
+PATCH_SITES=	epsilon.me.chalmers.se:patches/
+NCFTP=		env DOTDIR=${.CURDIR} ncftp
+NCFTPFLAGS=	-V2
 CATEGORIES=	networking languages
 
 MAINTAINER=	adam@veda.is
 
-_PATCHFILES=	1.0.9-1.0.9.1.gz
-.if defined(MASTER_SITE_OVERRIDE)
-PATCHSITE:=	${MASTER_SITE_OVERRIDE}
-.else
-PATCHSITE=	epsilon.me.chalmers.se:
-NCFTPFLAGS=
-.endif
-.if ${_PATCHFILES} != ""
-_PATCH_COOKIE=	${.CURDIR}/work/._patch_done
-PATCHLIST=	${.CURDIR}/work/.patchlist
-PATCHLEVEL=	.`echo ${_PATCHFILES} | sed 's/^.*\.\(.*\)\.gz$$/\1/'`
+.if ${PATCHFILES} != ""
+PATCHLEVEL!=	echo ${PATCHFILES} | sed 's/^.*\.\(.*\)\.gz$$/\1/'
+PKGNAME=	${DISTNAME}.${PATCHLEVEL}
 .endif
 WRKSRC=		${WRKDIR}/dgd/src
 
 pre-fetch:
-	@if [ ! -d ${DISTDIR}/${DISTNAME} ]; then mkdir -p ${DISTDIR}/${DISTNAME}; fi
-	@if [ ! -f ${DISTDIR}/${DISTNAME}.tar.gz ]; then \
-		echo ">> Fetching distribution file from remote site..."; \
-		${NCFTP} ${NCFTPFLAGS} ${PATCHSITE}${DISTNAME}.tar.gz \
-        		&& mv ${DISTNAME}.tar.gz ${DISTDIR}; \
-	fi
-.if defined(MASTER_SITE_OVERRIDE)
-	@for file in ${_PATCHFILES}; do \
-		if [ ! -f ${DISTDIR}/${DISTNAME}/$$file ]; then \
-			echo ">> Fetching patch $$file from remote site...";  \
-			${NCFTP} ${NCFTPFLAGS} ${PATCHSITE}${DISTNAME}/$$file \
-				&& mv $$file ${DISTDIR}/${DISTNAME}; \
-	    	fi \
-	 done
-.else
-	@for file in ${_PATCHFILES}; do \
-		if [ ! -f ${DISTDIR}/${DISTNAME}/$$file ]; then \
-			echo ">> Fetching patch $$file from remote site...";  \
-			${NCFTP} ${NCFTPFLAGS} ${PATCHSITE}patches/$$file \
-				&& mv patches/$$file ${DISTDIR}/${DISTNAME}; \
-	    	fi \
-	 done
-.endif
+	@ln -f ncftprc .ncftprc
 
-# Need to determine whether all author-supplied patches are correctly applied
-### not yet implemented
+pre-patch:
+	@ln -fs .. ${WRKSRC}/dgd
 
-.if ${_PATCHFILES} != ""
-pre-patch: ${_PATCH_COOKIE}
+post-patch:
 	@find -X ${WRKDIR}/dgd -name '*.orig' -print | xargs rm -f
 
-${_PATCH_COOKIE}:
-	@echo "===>  Updating to ${DISTNAME}${PATCHLEVEL}"
-	@cd ${DISTDIR}/${DISTNAME}; \
-		gzcat ${_PATCHFILES} | patch -d ${WRKDIR} --quiet -E -p0
-	@touch -f ${_PATCH_COOKIE}
-.endif
+post-build:
+	@cd ${WRKSRC}; ${MAKE} install
 
 do-install:
 	@chown -R mud.mud ${WRKDIR}/dgd
@@ -71,7 +41,7 @@ do-install:
 .if !defined(DO_PACKAGE)
 package:
 	@${MAKE} ${.MAKEFLAGS} 'PKG_CMD= WRKDIR=${WRKDIR} ${PKG_CMD}' \
-	    PKGNAME=${DISTNAME}${PATCHLEVEL} NO_INSTALL= DO_PACKAGE= package
+	    NO_INSTALL= DO_PACKAGE= package
 .endif
 
 .include <bsd.port.mk>