- Fix build failure - exposed after lastest modification of

  ../../devel/gettext-lib/buildlink.mk - due to incorrect usage of @INTLIBS@ in
  Automake's prog_LDADD variable. Thanks Johnny Lam for hints and explanations!
- While here get ride off build dependencies on auto* tools and GNU make by
  using a new set of patches and AUTOMAKE_OVERRIDE.
  Note: new Makefile.am files and hence their patches were generated with
  automake-1.1b!
- sort PLIST and use same `install-info' arguments as those generated by
  `make print-PLIST'.
- Fix broken dependencies when USE_XEMACS is defined.

8 files changed, 216 insertions, 147 deletions

diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 2f34e354e32..40bd5f83e59 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/03 15:28:56 agc Exp $
+# $NetBSD: Makefile,v 1.19 2001/11/03 09:59:35 seb Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -10,22 +10,20 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
 COMMENT=	Classic Berkeley gid/lid tools for looking up variables in code
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-
 BUILD_USES_MSGFMT=	yes
 BUILD_USES_GETTEXT_M4=	yes
 USE_BUILDLINK_ONLY=	yes
 
 INFO_FILES=	id-utils.info
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+AUTOMAKE_OVERRIDE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
 .ifdef USE_XEMACS
 EMACS=			${LOCALBASE}/bin/xemacs
-BUILD_DEPENDS+=		xemacs-[0-9]*:../editors/xemacs
-BUILD_DEPENDS+=		xemacs-packages-[0-9]*:../editors/xemacs-packages
+BUILD_DEPENDS+=		xemacs-[0-9]*:../../editors/xemacs
+BUILD_DEPENDS+=		xemacs-packages-[0-9]*:../../editors/xemacs-packages
 .elifdef USE_EMACS
 EMACS=			${LOCALBASE}/bin/emacs
 BUILD_DEPENDS+=		emacs-[0-9]*:../../editors/emacs
@@ -47,22 +45,10 @@ EMACS?=			${FALSE:S|^false$|/usr/bin/false|}
 
 CONFIGURE_ENV+=		EMACS=${EMACS}
 BUILD_DEFS+=		EMACS
+MAKE_ENV+=		BSD_SETENV=${SETENV}
 
 PLIST_SUBST+=		LISPDIR=${LISPDIR}
 PLIST_SUBST+=		CLISPDIR=${CLISPDIR}
 
-post-patch:
-	cd ${WRKSRC}/lisp && ${RM} -f elisp-comp
-
-# we manually copy missing and elisp-comp scripts in the sources
-# to get around an apparent bug (??) in automake...
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/aclocal && \
-	${LOCALBASE}/bin/autoheader && \
-	${CP} ${LOCALBASE}/share/automake/missing ./missing && \
-	${CP} ${LOCALBASE}/share/automake/elisp-comp ./lisp/elisp-comp && \
-	${LOCALBASE}/bin/automake --gnu && \
-	${LOCALBASE}/bin/autoconf
-
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/PLIST b/devel/id-utils/PLIST
index 81d6b24d6d9..30dc15bb965 100644
--- a/devel/id-utils/PLIST
+++ b/devel/id-utils/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:11 zuntum Exp $
-bin/mkid
-bin/lid
+@comment $NetBSD: PLIST,v 1.2 2001/11/03 09:59:35 seb Exp $
+bin/aid
+bin/defid
+bin/eid
 bin/fid
 bin/fnid
-bin/xtokid
-bin/eid
-bin/aid
 bin/gid
-bin/defid
-@unexec install-info --delete %D/info/id-utils.info %D/info/dir
+bin/lid
+bin/mkid
+bin/xtokid
+@unexec install-info --delete --info-dir=%D/info %D/info/id-utils.info
 info/id-utils.info
-@exec install-info %D/info/id-utils.info %D/info/dir
+@exec install-info --info-dir=%D/info %D/info/id-utils.info
 share/id-lang.map
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/id-utils.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/id-utils.mo
diff --git a/devel/id-utils/distinfo b/devel/id-utils/distinfo
index ae12fe8ba2b..b523d73eafc 100644
--- a/devel/id-utils/distinfo
+++ b/devel/id-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/09/19 08:57:06 joda Exp $
+$NetBSD: distinfo,v 1.5 2001/11/03 09:59:36 seb Exp $
 
 SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5
 Size (id-utils-3.2.tar.gz) = 388012 bytes
@@ -6,10 +6,11 @@ SHA1 (patch-aa) = 69cdce8f83d043ffabbec7639423e35a46a97175
 SHA1 (patch-ab) = bb079b1a82c500fcb93d45bdf0fbb14a3729c0cb
 SHA1 (patch-ac) = f1f941b47e918dafc87b9b47f56e7026899eb229
 SHA1 (patch-ad) = cd13aea19f0ac5dcdc8695ce40b409ecb15b1ec0
-SHA1 (patch-ae) = 58fa58e328fd658ee9c4d1dc88e9a23da8ddea8e
-SHA1 (patch-af) = 5bd90d47e2991667b96e29a5883a8aa809eb33a7
-SHA1 (patch-ag) = 85312aeb8c39f653205d51e881d4533a542657ec
-SHA1 (patch-ah) = 0b18b576be854935cb79cc3eb85848447ac17909
+SHA1 (patch-ae) = 3c3d118779b18bd91e2cd3ff88c3b47ec3236396
+SHA1 (patch-af) = 968b7ccaf20cda7afa781b043559e91bfb7e74d4
+SHA1 (patch-ag) = 9039dfd96f320f6da6dbeb1012fcd5c554500beb
+SHA1 (patch-ah) = 962276de4a6582e88e3eea8a6c2f8246c958bea0
 SHA1 (patch-ai) = be9f59a6a2e84338d6df945ba5d10285d3205560
 SHA1 (patch-aj) = 7f2b3f1eaadfc3a71169d16010375eaf0ce96b46
 SHA1 (patch-ak) = 4d7807168b4fa9e3d497c943f45892e6d574ef9d
+SHA1 (patch-al) = 5ff628040e5f3c27263bded593deea57ad0847f5
diff --git a/devel/id-utils/patches/patch-ae b/devel/id-utils/patches/patch-ae
index 4bc7d14b4bc..b9d507505da 100644
--- a/devel/id-utils/patches/patch-ae
+++ b/devel/id-utils/patches/patch-ae
@@ -1,16 +1,28 @@
-$NetBSD: patch-ae,v 1.1 2001/08/04 09:52:27 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/11/03 09:59:36 seb Exp $
 
 --- lisp/Makefile.am.orig	Sun Jun  2 07:15:31 1996
 +++ lisp/Makefile.am
-@@ -1,10 +1,3 @@
+@@ -1,10 +1,21 @@
  ## Process this file with automake to create Makefile.in
  
--EXTRA_DIST = id-utils.el elisp-comp
++# Makefile.in's patch is produced after regen from Makefile.am with
++# automake-1.1b
++
+ EXTRA_DIST = id-utils.el elisp-comp
 -elc_SCRIPTS = id-utils.elc
--elcdir = @LISPDIR@
--SUFFIXES = .el .elc
--
--.el.elc:
--	@echo "WARNING: Warnings can be ignored. :-)"
++elc_DATA = id-utils.elc
+ elcdir = @LISPDIR@
++eldir = @LISPDIR@
+ SUFFIXES = .el .elc
++.SUFFIXES: .el .elc
+ 
+ .el.elc:
+ 	@echo "WARNING: Warnings can be ignored. :-)"
 -	$(SHELL) $(srcdir)/elisp-comp $<
-+lisp_LISP = id-utils.el
++	$(BSD_SETENV) EMACS=@EMACS@ $(SHELL) $(srcdir)/elisp-comp $<
++
++install-data-hook:
++	if test -f id-utils.elc; then \
++		$(mkinstalldirs) $(eldir); \
++		$(INSTALL_DATA) $(srcdir)/id-utils.el $(eldir)/id-utils.el; \
++	fi
diff --git a/devel/id-utils/patches/patch-af b/devel/id-utils/patches/patch-af
index d161d2cbeac..8c033f3096e 100644
--- a/devel/id-utils/patches/patch-af
+++ b/devel/id-utils/patches/patch-af
@@ -1,16 +1,107 @@
-$NetBSD: patch-af,v 1.1 2001/08/04 09:52:27 wiz Exp $
+$NetBSD: patch-af,v 1.2 2001/11/03 09:59:36 seb Exp $
 
---- libidu/Makefile.am.orig	Sun Jul  7 18:36:06 1996
-+++ libidu/Makefile.am
-@@ -2,9 +2,9 @@
+--- lisp/Makefile.in.orig	Wed Aug  7 05:27:21 1996
++++ lisp/Makefile.in
+@@ -4,6 +4,9 @@
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
  
- AUTOMAKE_OPTIONS = ansi2knr
++# Makefile.in's patch is produced after regen from Makefile.am with
++# automake-1.1b
++
  
--noinst_LIBRARIES = idu
-+noinst_LIBRARIES = libidu.a
+ SHELL = /bin/sh
  
--idu_SOURCES = dynvec.c hash.c idfile.c idread.c idwrite.c fnprint.c \
-+libidu_a_SOURCES = dynvec.c hash.c idfile.c idread.c idwrite.c fnprint.c \
- 	scanners.c walker.c
+@@ -39,12 +42,13 @@
+ transform = @program_transform_name@
+ 
+ EXTRA_DIST = id-utils.el elisp-comp
+-elc_SCRIPTS = id-utils.elc
++elc_DATA = id-utils.elc
+ elcdir = @LISPDIR@
++eldir = @LISPDIR@
+ SUFFIXES = .el .elc
+ mkinstalldirs = $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+-SCRIPTS = $(elc_SCRIPTS)
++DATA = $(elc_DATA)
+ 
+ DIST_COMMON = Makefile.am Makefile.in elisp-comp
+ 
+@@ -67,20 +71,19 @@
+ Makefile: $(top_builddir)/config.status Makefile.in
+ 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+ 
+-install-elcSCRIPTS: $(elc_SCRIPTS)
++install-elcDATA: $(elc_DATA)
+ 	$(mkinstalldirs) $(elcdir)
+-	list="$(elc_SCRIPTS)"; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    $(INSTALL_SCRIPT) $$p $(elcdir)/`echo $$p|sed '$(transform)'`; \
+-	  else if test -f $(srcdir)/$$p; then \
+-	    $(INSTALL_SCRIPT) $(srcdir)/$$p \
+-	      $(elcdir)/`echo $$p|sed '$(transform)'`; \
+-	  else :; fi; fi; \
++	list="$(elc_DATA)"; for p in $$list; do \
++	  if test -f $(srcdir)/$$p; then \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(elcdir)/$$p; \
++	  else if test -f $$p; then \
++	    $(INSTALL_DATA) $$p $(elcdir)/$$p; \
++	  fi; fi; \
+ 	done
+ 
+-uninstall-elcSCRIPTS:
+-	list="$(elc_SCRIPTS)"; for p in $$list; do \
+-	  rm -f $(elcdir)/`echo $$p|sed '$(transform)'`; \
++uninstall-elcDATA:
++	list="$(elc_DATA)"; for p in $$list; do \
++	  rm -f $(elcdir)/$$p; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -105,14 +108,15 @@
+ 
+ install-exec: 
+ 
+-install-data: install-elcSCRIPTS
++install-data: install-elcDATA
++	$(MAKE) install-data-hook
+ 
+ install: install-exec install-data all
+ 	@:
+ 
+-uninstall: uninstall-elcSCRIPTS
++uninstall: uninstall-elcDATA
+ 
+-all: $(SCRIPTS) Makefile
++all: $(DATA) Makefile
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+@@ -144,15 +148,22 @@
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+-.PHONY: default uninstall-elcSCRIPTS install-elcSCRIPTS tags distdir \
+-info dvi check installcheck install-exec install-data install uninstall \
+-all installdirs mostlyclean-generic distclean-generic clean-generic \
++.PHONY: default uninstall-elcDATA install-elcDATA tags distdir info dvi \
++check installcheck install-exec install-data install uninstall all \
++installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
++.SUFFIXES: .el .elc
+ 
+ .el.elc:
+ 	@echo "WARNING: Warnings can be ignored. :-)"
+-	$(SHELL) $(srcdir)/elisp-comp $<
++	$(BSD_SETENV) EMACS=@EMACS@ $(SHELL) $(srcdir)/elisp-comp $<
++
++install-data-hook:
++	if test -f id-utils.elc; then \
++		$(mkinstalldirs) $(eldir); \
++		$(INSTALL_DATA) $(srcdir)/id-utils.el $(eldir)/id-utils.el; \
++	fi
+ .SUFFIXES:
+ .SUFFIXES: .el .elc
  
- idudir = $(prefix)/share
diff --git a/devel/id-utils/patches/patch-ag b/devel/id-utils/patches/patch-ag
index e28f4fa5847..187e6f4fff4 100644
--- a/devel/id-utils/patches/patch-ag
+++ b/devel/id-utils/patches/patch-ag
@@ -1,26 +1,25 @@
-$NetBSD: patch-ag,v 1.1 2001/08/04 09:52:27 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/11/03 09:59:36 seb Exp $
 
---- lib/Makefile.am.orig	Tue Jul  9 06:22:34 1996
-+++ lib/Makefile.am
-@@ -1,13 +1,13 @@
- ## Process this file with automake to create Makefile.in
+--- lisp/elisp-comp.orig	Tue Aug  8 00:39:31 1995
++++ lisp/elisp-comp
+@@ -28,13 +28,19 @@
+ if test $# = 0; then
+   echo 1>&2 "No files given to $0"
+ else
++   if test -z "$EMACS" || test "$EMACS" = "t"; then
++      # Value of "t" means we are running in a shell under Emacs.
++      # Just assume Emacs is called "emacs".
++      EMACS=emacs
++   fi
++
+   tempdir=elc.$$
+   mkdir $tempdir
+   cp $* $tempdir
+   cd $tempdir
  
--noinst_LIBRARIES = sys
-+noinst_LIBRARIES = libsys.a
+   echo "(setq load-path (cons nil load-path))" > script
+-  emacs -batch -l script -f batch-byte-compile *.el
++  $EMACS -batch -l script -f batch-byte-compile *.el
+   mv *.elc ..
  
- EXTRA_DIST = alloca.c basename.c dirname.c error.c fnmatch.c getopt.c \
- 	getopt1.c memcpy.c memset.c obstack.c regex.c rx.c \
- 	strcasecmp.c strcspn.c strdup.c strndup.c strpbrk.c strspn.c \
- 	strstr.c strtok.c
- 
--sys_SOURCES = xgetcwd.c xmalloc.c
-+libsys_a_SOURCES = xgetcwd.c xmalloc.c
- 
- noinst_HEADERS = ansidecl.h error.h fnmatch.h getopt.h obstack.h \
- 	pathmax.h regex.h rx.h xalloca.h xdirent.h xfnmatch.h \
-@@ -19,4 +19,4 @@
- 	   -I../intl -I$(top_srcdir)/intl \
- 	   -I.. -I$(top_srcdir) 
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
--sys_LIBADD = @REGEXOBJ@ @LIBOBJS@ @ALLOCA@
-+libsys_a_LIBADD = @LIBOBJS@ @ALLOCA@
+   cd ..
diff --git a/devel/id-utils/patches/patch-ah b/devel/id-utils/patches/patch-ah
index a89ece0e77f..f900613d92f 100644
--- a/devel/id-utils/patches/patch-ah
+++ b/devel/id-utils/patches/patch-ah
@@ -1,72 +1,21 @@
-$NetBSD: patch-ah,v 1.1 2001/08/04 09:52:28 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/11/03 09:59:36 seb Exp $
 
---- configure.in.orig	Wed Aug  7 05:16:19 1996
-+++ configure.in
-@@ -10,7 +10,7 @@
- ##############################################################################
- 
- AC_INIT(src/mkid.c)
--AC_CONFIG_HEADER(config.h)
-+AM_CONFIG_HEADER(config.h)
- AC_PREREQ(2.10)
- AC_ARG_PROGRAM
- 
-@@ -50,7 +50,7 @@
- 
- AC_PROG_CC
- AC_PROG_LN_S
--AM_PROG_INSTALL
-+AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_CPP
- AC_PROG_GCC_TRADITIONAL
-@@ -81,12 +81,12 @@
- ################ Check for typedefs, structs, and compiler params ############
- ##############################################################################
- 
--AC_C_CONST
- AM_C_PROTOTYPES
-+AC_C_CONST
- AC_TYPE_SIGNAL
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
--md_TYPE_PTRDIFF_T
-+AM_TYPE_PTRDIFF_T
- 
- ##############################################################################
- ################ Set default compilation flags ###############################
-@@ -102,20 +102,20 @@
- ##############################################################################
- 
- AC_FUNC_ALLOCA
--ud_WITH_REGEX
-+AM_WITH_REGEX
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(getwd getcwd link strerror isascii bcopy bzero memcpy)
- AC_REPLACE_FUNCS(strdup strndup strspn strcspn strpbrk strstr strtok)
- AC_REPLACE_FUNCS(basename dirname fnmatch error memcpy memset)
--AC_REPLACE_GNU_GETOPT
--AC_REPLACE_OBSTACK
-+AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"])
-+AC_SUBST(LIBOBJS)
-+AM_FUNC_OBSTACK
- 
- ##############################################################################
- ################ Internationalization ########################################
- ##############################################################################
- 
--ud_GNU_GETTEXT
--AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-+AM_GNU_GETTEXT
- 
- ##############################################################################
- ################ Find a home for language map ################################
-@@ -134,7 +134,7 @@
- ################ Find a home for Emacs Lisp code #############################
- ##############################################################################
- 
--ud_PATH_LISPDIR
-+AM_PATH_LISPDIR
- 
- ##############################################################################
- ################ Generate the configure script ###############################
+--- src/Makefile.am.orig	Sun Jun  9 02:22:34 1996
++++ src/Makefile.am
+@@ -1,5 +1,8 @@
+ ## Process this file with automake to create Makefile.in
+ 
++# Makefile.in's patch is produced after regen from Makefile.am with
++# `automake-1.1b --include-deps,' then it is hand-trimmed
++
+ AUTOMAKE_OPTIONS = ansi2knr
+ 
+ bin_PROGRAMS = mkid lid fid fnid xtokid
+@@ -16,5 +19,6 @@
+ 	   -I.. -I$(top_srcdir) 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
++DEPLIBS = ../libidu/libidu.a ../lib/libsys.a
+ 
+-$(PROGRAMS): $(LDADD)
++$(PROGRAMS): $(DEPLIBS)
diff --git a/devel/id-utils/patches/patch-al b/devel/id-utils/patches/patch-al
new file mode 100644
index 00000000000..d0b6e6888f7
--- /dev/null
+++ b/devel/id-utils/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1 2001/11/03 09:59:36 seb Exp $
+
+--- src/Makefile.in.orig	Fri Nov  2 01:48:54 2001
++++ src/Makefile.in
+@@ -4,6 +4,9 @@
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ 
++# Makefile.in's patch is produced after regen from Makefile.am with
++# `automake-1.1b --include-deps,' then it is hand-trimmed
++
+ 
+ SHELL = /bin/sh
+ 
+@@ -54,6 +57,7 @@
+ 	   -I.. -I$(top_srcdir) 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ LDADD = @INTLLIBS@ ../libidu/libidu.a ../lib/libsys.a
++DEPLIBS = ../libidu/libidu.a ../lib/libsys.a
+ mkinstalldirs = $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -337,7 +315,7 @@
+ maintainer-clean
+ 
+ 
+-$(PROGRAMS): $(LDADD)
++$(PROGRAMS): $(DEPLIBS)
+ .SUFFIXES:
+ .SUFFIXES: .c .o ._c ._o
+