am-utils update to 6.2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: am-utils update to 6.2
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Sat, 12 Dec 2015 22:15:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sun Dec 13 11:15:52 2015 +1300
Changeset:	e87d38bce40b4f62b77c6ae81ab82ab934958110

Modified Files:
	am-utils/Makefile
	am-utils/PLIST
	am-utils/distinfo
	am-utils/patches/patch-aa
Added Files:
	am-utils/options.mk
	am-utils/patches/patch-fsinfo_Makefile.in
	am-utils/patches/patch-ylwrap.amd
Removed Files:
	am-utils/patches/patch-ab

Log Message:
am-utils update to 6.2

    - Removed license advertising clause
    - Removed expn program

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e87d38bce40b4f62b77c6ae81ab82ab934958110

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 am-utils/Makefile                         | 13 +++++++++----
 am-utils/PLIST                            |  7 +++----
 am-utils/distinfo                         | 14 ++++++++------
 am-utils/options.mk                       | 14 ++++++++++++++
 am-utils/patches/patch-aa                 | 12 ++++++------
 am-utils/patches/patch-ab                 | 21 ---------------------
 am-utils/patches/patch-fsinfo_Makefile.in | 13 +++++++++++++
 am-utils/patches/patch-ylwrap.amd         | 13 +++++++++++++
 8 files changed, 66 insertions(+), 41 deletions(-)

diffs:
diff --git a/am-utils/Makefile b/am-utils/Makefile
index 5d2ace9..c73d8c8 100644
--- a/am-utils/Makefile
+++ b/am-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/08/30 14:56:45 hfath Exp $
+# $NetBSD$
 #
 
-DISTNAME=	${PKGNAME}-rc1
+DISTNAME=	am-utils-6.2
 PKGNAME=	am-utils-6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
@@ -20,15 +20,17 @@ HOMEPAGE=		http://www.am-utils.org/
 COMMENT=		Berkeley automounter suite of utilities
 LICENSE=		original-bsd
 
-USE_TOOLS+=		yacc lex perl:run
+USE_TOOLS+=		yacc lex perl:run gmake
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
 INFO_FILES=		yes
 
 CONFIGURE_ARGS+=	--without-ldap
-CONFIGURE_ARGS+=	--without-hesiod
 CONFIGURE_ARGS+=	--without-ndbm
+CONFIGURE_ARGS+=	--enable-debug=yes
+
+.include "options.mk"
 
 RCD_SCRIPTS=		amd-pkgsrc
 
@@ -42,6 +44,9 @@ EXTRA_DOC_FILES=	COPYING FAQ ChangeLog BUGS AUTHORS \
                         README.osx README.y2k NEWS README INSTALL
 EXAMPLE_CONF_FILES=	amd.conf lostaltmail.conf
 
+post-patch:
+	cp ${WRKSRC}/amd/ops_nfs3.c ${WRKSRC}/amd/ops_nfs4.c
+
 post-install:
 .for i in ${EXTRA_DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PKGDOCDIR}
diff --git a/am-utils/PLIST b/am-utils/PLIST
index b63c7c4..57d1eb3 100644
--- a/am-utils/PLIST
+++ b/am-utils/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2013/08/30 14:56:45 hfath Exp $
-bin/expn
+@comment $NetBSD$
 bin/pawd
 info/am-utils.info
+info/am-utils.info-1
+info/am-utils.info-2
 lib/libamu.la
-man/man1/expn.1
 man/man1/pawd.1
 man/man5/amd.conf.5
 man/man8/amd.8
@@ -50,4 +50,3 @@ share/doc/am-utils/README.y2k
 share/examples/am-utils/amd.conf
 share/examples/am-utils/lostaltmail.conf
 share/examples/rc.d/amd-pkgsrc
-@pkgdir etc/amd
diff --git a/am-utils/distinfo b/am-utils/distinfo
index 1adfaa5..4b8f09e 100644
--- a/am-utils/distinfo
+++ b/am-utils/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2013/08/30 14:56:45 hfath Exp $
+$NetBSD$
 
-SHA1 (am-utils-6.2-rc1.tar.gz) = b3afe9e4f4d4c20cc4e431af28b381f66b511114
-RMD160 (am-utils-6.2-rc1.tar.gz) = d7b4437cb69b7067a562ba3a14ae63dc2a75dda1
-Size (am-utils-6.2-rc1.tar.gz) = 1730021 bytes
-SHA1 (patch-aa) = 181e045b7bd049eddac9248c6eb4cd2209aaf325
-SHA1 (patch-ab) = 3502892407ecf89f47f3683defdf9c1dfada9f45
+SHA1 (am-utils-6.2.tar.gz) = 29fd2a6924b85a78deb6690a5a670dbf9eace6ad
+RMD160 (am-utils-6.2.tar.gz) = 49444d4ca7c0131dcdb82967b9df2ff06de13830
+SHA512 (am-utils-6.2.tar.gz) = 868b662b113cffabb32ae88731e877e4c9830adf454f7e23d9bd033b534745e0e7b75619c6d7fa58ae13fa67dd588f4a789f53e452d0b4ffde90f3a3ed03de34
+Size (am-utils-6.2.tar.gz) = 2297161 bytes
+SHA1 (patch-aa) = 51ce9ff8724a190ab4bcae8f70af2006685f7ad4
+SHA1 (patch-fsinfo_Makefile.in) = 4d8e4642ebd9dfc2b504af2477c34a89c9cf1768
+SHA1 (patch-ylwrap.amd) = e30de2720929bf70cfd1bcdd6a9e02cedf7d615b
diff --git a/am-utils/options.mk b/am-utils/options.mk
new file mode 100644
index 0000000..640b0d9
--- /dev/null
+++ b/am-utils/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.am-utils
+PKG_SUPPORTED_OPTIONS=	hesiod
+PKG_SUGGESTED_OPTIONS=	hesiod
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mhesiod)
+.include "../../net/hesiod/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-hesiod
+.else
+CONFIGURE_ARGS+=	--without-hesiod
+.endif
diff --git a/am-utils/patches/patch-aa b/am-utils/patches/patch-aa
index e53d13a..3f225d1 100644
--- a/am-utils/patches/patch-aa
+++ b/am-utils/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/10/26 17:16:23 cheusov Exp $
+$NetBSD$
 
---- scripts/Makefile.in.orig	2006-05-11 20:28:53.000000000 +0300
+--- scripts/Makefile.in.orig	2014-10-30 14:38:56.000000000 +0000
 +++ scripts/Makefile.in
-@@ -218,7 +218,7 @@ noinst_SCRIPTS = \
+@@ -308,7 +308,7 @@ noinst_SCRIPTS = \
+ 	redhat-ctl-amd	\
  	test-attrcache
  
- bin_SCRIPTS = expn
 -sysconf_DATA = amd.conf-sample lostaltmail.conf-sample
-+sysconf_DATA =
++sysconf_DATA = 
  
  # man pages
- man_MANS = amd.conf.5 automount2amd.8 expn.1
+ man_MANS = amd.conf.5 automount2amd.8
diff --git a/am-utils/patches/patch-ab b/am-utils/patches/patch-ab
deleted file mode 100644
index bb8181c..0000000
--- a/am-utils/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/04/16 20:07:33 cheusov Exp $
-
---- scripts/expn.in.orig	2002-07-11 17:28:20.000000000 +0300
-+++ scripts/expn.in
-@@ -9,6 +9,7 @@
- # hardcoded constants, should work fine for BSD-based systems
- #require 'sys/socket.ph';	# perl 4
- use Socket;			# perl 5
-+use Fcntl;
- $AF_INET = &AF_INET;
- $SOCK_STREAM = &SOCK_STREAM;
- 
-@@ -1009,7 +1010,7 @@ sub mxlookup
- 	}
- 
- 	$0 = "$av0 - nslookup of $server";
--	open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n";
-+	sysopen(T,"/tmp/expn$$", O_EXCL | O_CREAT) || die "open > /tmp/expn$$: $!\n";
- 	print T "set querytype=MX\n";
- 	print T "$server\n";
- 	close(T);
diff --git a/am-utils/patches/patch-fsinfo_Makefile.in b/am-utils/patches/patch-fsinfo_Makefile.in
new file mode 100644
index 0000000..a48b151
--- /dev/null
+++ b/am-utils/patches/patch-fsinfo_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- fsinfo/Makefile.in.orig	2014-10-30 14:38:56.000000000 +0000
++++ fsinfo/Makefile.in
+@@ -268,7 +268,7 @@ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ # must manually add f/lex library to LIBS, and not to LDADD.
+-LIBS = @LIBS@ @LEXLIB@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LIBTOOL_LDFLAGS = @LIBTOOL_LDFLAGS@
diff --git a/am-utils/patches/patch-ylwrap.amd b/am-utils/patches/patch-ylwrap.amd
new file mode 100644
index 0000000..4f0af01
--- /dev/null
+++ b/am-utils/patches/patch-ylwrap.amd
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ylwrap.amd.orig	2014-10-30 14:37:46.000000000 +0000
++++ ylwrap.amd
+@@ -173,7 +173,7 @@ case "$prog" in
+ 	flags="-P${prefix}"
+ 	out="mv lex.$prefix.c lex.yy.c"
+ 	;;
+-yacc|bison)
++*yacc|*bison)
+ 	flags="-p $prefix";;
+ esac
+
Prev by Date: gdmap: Remove, imported to pkgsrc as sysutils/gdmap
Next by Date: sonic-visualiser: Add libtool dependency. Fix a nonportable header.
Previous by Thread: gdmap: Remove, imported to pkgsrc as sysutils/gdmap
Next by Thread: sonic-visualiser: Add libtool dependency. Fix a nonportable header.
Indexes:
Home | Main Index | Thread Index | Old Index