Update to 1.0.16, correct MASTER_SITE and HOMEPAGE,

add LICENSE, and PKG_DESTDIR_SUPPORT.

3 files changed, 26 insertions, 18 deletions

diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index f83a36a89c4..f28e4553e9d 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2009/11/19 17:13:24 schnoebe Exp $
 
-DISTNAME=		cvsd-1.0.13
+DISTNAME=		cvsd-1.0.16
 CATEGORIES=		devel scm
-MASTER_SITES=		http://ch.tudelft.nl/~arthur/cvsd/
+MASTER_SITES=		http://arthurdejong.org/cvsd/
 
 MAINTAINER=		eric@cirr.com
-HOMEPAGE=		http://ch.tudelft.nl/~arthur/cvsd/
+HOMEPAGE=		http://arthurdejong.org/cvsd/
 COMMENT=		Run CVS pserver in a chroot-ed environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+LICENSE=		gnu-gpl-v2
+
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		YES
 
@@ -27,8 +30,10 @@ PKG_GROUPS=		${CVSD_GROUP}
 PKG_GROUPS_VARS+=	CVSD_GROUP
 PKG_USERS_VARS+=	CVSD_USER
 
+INSTALLATION_DIRS=	${EGDIR}
+
 pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsd/distinfo b/devel/cvsd/distinfo
index 0b7c17cea04..207bc17a95d 100644
--- a/devel/cvsd/distinfo
+++ b/devel/cvsd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/09/06 19:04:59 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/11/19 17:13:24 schnoebe Exp $
 
-SHA1 (cvsd-1.0.13.tar.gz) = 0fd52d3dacf037c6e0ca210482fe31bd5c847aac
-RMD160 (cvsd-1.0.13.tar.gz) = a4781083bd2e2623fae39d577961b31d9a57bede
-Size (cvsd-1.0.13.tar.gz) = 247817 bytes
+SHA1 (cvsd-1.0.16.tar.gz) = 69f7dbee69eaab61cea232e0f01cf5a87b8e518f
+RMD160 (cvsd-1.0.16.tar.gz) = 08b8d5bf626a95f3465083c6b9e5f10f2763071d
+Size (cvsd-1.0.16.tar.gz) = 234898 bytes
 SHA1 (patch-aa) = 8cef69eb184abdbea08314243c124ef0715bb275
 SHA1 (patch-ab) = 5a6c8046234edff271d521912eadf8bc8ebd294e
-SHA1 (patch-ac) = 3caa574e077d4650a603c8c5d59770b342628fc9
+SHA1 (patch-ac) = edfc916c6e475ecdb37ef59494d69cbd0d3df34c
 SHA1 (patch-ad) = 6a60053187293687214d3565c5a6e1d373e5862f
diff --git a/devel/cvsd/patches/patch-ac b/devel/cvsd/patches/patch-ac
index fdec087373f..1fee8a20782 100644
--- a/devel/cvsd/patches/patch-ac
+++ b/devel/cvsd/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2006/05/30 19:24:27 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2009/11/19 17:13:24 schnoebe Exp $
 
---- Makefile.in.orig	2006-05-24 20:25:24.000000000 +0000
+--- Makefile.in.orig	2008-12-21 09:13:58.000000000 -0600
 +++ Makefile.in
 @@ -189,6 +189,8 @@ libexecdir = @libexecdir@
  localedir = @localedir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2006/05/30 19:24:27 wiz Exp $
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
  pdfdir = @pdfdir@
-@@ -772,17 +774,19 @@ uninstall-man: uninstall-man5 uninstall-
+@@ -765,18 +767,21 @@ uninstall-man: uninstall-man5 uninstall-
  
  
  #  install configuration files
@@ -19,22 +19,25 @@ $NetBSD: patch-ac,v 1.2 2006/05/30 19:24:27 wiz Exp $
 +install-data-local: install-configfile install-readme
 +
 +install-readme:
-+	if [ ! -d $(DESTDIR)$(docdir) ]; then \
++	if [ $(DESTDIR)$(docdir) ]; then \
 +	    $(mkinstalldirs) $(DESTDIR)$(docdir); \
 +	fi
 +	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(docdir)
++
+ uninstall-local: uninstall-configfile uninstall-initscript
  
  install-configfile:
- 	if [ ! -d $(DESTDIR)$(sysconfdir)/cvsd ]; then \
+-	if [ ! -d $(DESTDIR)$(sysconfdir)/cvsd ]; then \
 -	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/cvsd;\
 -	fi
 -	if [ ! -f $(DESTDIR)$(CONFIGFILE) ]; then \
 -	  $(INSTALL_DATA) $(srcdir)/cvsd.conf-dist $(DESTDIR)$(CONFIGFILE); \
 -	else \
 -	  echo "$(DESTDIR)$(CONFIGFILE) already exists, install will not overwrite"; \
++	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
 +	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir);\
  	fi
-+	$(INSTALL_DATA) $(srcdir)/cvsd.conf-dist $(DESTDIR)$(exampledir)/cvsd.conf.example
++	$(INSTALL_DATA) $(srcdir)/cvsd.conf-dist $(DESTDIR)$(exampledir)/cvsd.conf.example;
  
- install-initscript:
- 	if [ ! -d $(DESTDIR)$(sysconfdir)/init.d ]; then \
+ uninstall-configfile:
+ 	-rm -f $(DESTDIR)$(CONFIGFILE)