(pkgsrc)

 - patch-aa is now included, removed.
 - Add LICENSE= gnu-gpl-v2
 - Add CONF_FILES related ${MV} at target post-install:
(Upstream)
 - Update 1.2  to 1.3.3
   15/9/2009 1.3.3 release
   15/9/2009 added GPL license header to source files
   15/9/2009 --as-needed fix, patched src/tools/Makefile.am from Gentoo bug #128678
   8/6/2009 1.3.2 release
   8/6/2009 hide passwords from ps
   4/2/2009 1.3.1 release
   4/2/2009 removed reference to list option in man page and usage
   4/2/2009 updated libtool
   13/5/2005 disable ldap referrals to work better with win2k3 sp1
   30/8/2004 optarg null pointer fixes (Hilko Bengen)
   30/8/2004 delete password from memory (Stephan M«äller)

4 files changed, 22 insertions, 35 deletions

diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index 62fcabbb85c..cb9877bd208 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2014/10/09 14:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/12/10 09:43:29 mef Exp $
 #
 
-DISTNAME=	adtool-1.2
-PKGREVISION=	7
+DISTNAME=	adtool-1.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://gp2x.org/adtool/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gp2x.org/adtool/
 COMMENT=	Active Directory administration utility for Unix
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -19,6 +19,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/adtool
 CONF_FILES=		${EGDIR}/adtool.cfg.dist ${PKG_SYSCONFDIR}/adtool.cfg
+INSTALLATION_DIRS=	${EGDIR}
+
+post-install:
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/adtool.cfg.dist ${DESTDIR}${EGDIR}
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/adtool/distinfo b/sysutils/adtool/distinfo
index cb073a6730f..964224440c0 100644
--- a/sysutils/adtool/distinfo
+++ b/sysutils/adtool/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/01/30 16:17:06 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/12/10 09:43:29 mef Exp $
 
-SHA1 (adtool-1.2.tar.gz) = fab5a640c8fe60a10c916e3f1c0d1d0a3ba2c974
-RMD160 (adtool-1.2.tar.gz) = 1afa9f6955c8b2b10f1cd2f73952aeb83d5af979
-Size (adtool-1.2.tar.gz) = 202328 bytes
-SHA1 (patch-aa) = e2dc489cfd6cc67da2782d134d331521bb2ba581
-SHA1 (patch-ab) = f594933de70a596f3ea711175cc1577c0805d4a2
+SHA1 (adtool-1.3.3.tar.gz) = ec2186442ebd3cddd4524802b7f0433dc3570035
+RMD160 (adtool-1.3.3.tar.gz) = a0668e42456b73ce6ad099c0b82600fd51548bfa
+Size (adtool-1.3.3.tar.gz) = 334767 bytes
+SHA1 (patch-ab) = d229fc43c29c48711aac27b4dfda5b89c5a649ba
diff --git a/sysutils/adtool/patches/patch-aa b/sysutils/adtool/patches/patch-aa
deleted file mode 100644
index c06bd7602e8..00000000000
--- a/sysutils/adtool/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/30 21:11:56 minskim Exp $
-
---- src/etc/Makefile.in.orig	2003-09-30 15:33:27.000000000 +0200
-+++ src/etc/Makefile.in	2003-09-30 15:34:45.000000000 +0200
-@@ -147,12 +147,12 @@
- sysconfDATA_INSTALL = $(INSTALL_DATA)
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/adtool
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
--	  $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-+	  $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(prefix)/share/examples/adtool/$$f; \
- 	done
- 
- uninstall-sysconfDATA:
diff --git a/sysutils/adtool/patches/patch-ab b/sysutils/adtool/patches/patch-ab
index e25f883a604..1425e3776cf 100644
--- a/sysutils/adtool/patches/patch-ab
+++ b/sysutils/adtool/patches/patch-ab
@@ -1,16 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2006/01/30 16:17:06 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2014/12/10 09:43:29 mef Exp $
 
---- src/tools/Makefile.in.orig	2006-01-30 16:12:37.000000000 +0000
-+++ src/tools/Makefile.in
-@@ -119,7 +119,10 @@ target_alias = @target_alias@
- 
+Don't hard-code -lpthread. Don't link with -lresolv on DragonFly.
+(above is by @joerg from cvs log. But -pthread does not exist anymore)
+
+--- src/tools/Makefile.in.orig	2009-08-15 22:19:24.000000000 +0900
++++ src/tools/Makefile.in	2014-12-10 18:16:10.000000000 +0900
+@@ -141,6 +141,11 @@ target_alias = @target_alias@
  INCLUDES = -I@top_srcdir@/src/lib
  AM_CFLAGS = @CFLAGS@
--AM_LDFLAGS = -lldap -llber -lldap_r -lpthread -lresolv @LDFLAGS@
+ 
 +AM_LDFLAGS = -lldap -llber -lldap_r ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} @LDFLAGS@
 +.if ${OPSYS} != "DragonFly"
 +AM_LDFLAGS += -lresolv
 +.endif
- 
++
  bin_PROGRAMS = adtool
  
+ adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv