Some fixes provided by Stoned Elipot in pkg/13340:

. Use ${PKGLOCALEDIR} instead of share
. No more additional files installed depending on whether {x}emacs is
  installed or not -- define USE_EMACS or USE_XEMACS if you want to have
  .elc files installed.
. buildlinkify

4 files changed, 130 insertions, 0 deletions

diff --git a/devel/id-utils/patches/patch-ae b/devel/id-utils/patches/patch-ae
new file mode 100644
index 00000000000..4bc7d14b4bc
--- /dev/null
+++ b/devel/id-utils/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2001/08/04 09:52:27 wiz Exp $
+
+--- lisp/Makefile.am.orig	Sun Jun  2 07:15:31 1996
++++ lisp/Makefile.am
+@@ -1,10 +1,3 @@
+ ## Process this file with automake to create Makefile.in
+ 
+-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. :-)"
+-	$(SHELL) $(srcdir)/elisp-comp $<
++lisp_LISP = id-utils.el
diff --git a/devel/id-utils/patches/patch-af b/devel/id-utils/patches/patch-af
new file mode 100644
index 00000000000..d161d2cbeac
--- /dev/null
+++ b/devel/id-utils/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2001/08/04 09:52:27 wiz Exp $
+
+--- libidu/Makefile.am.orig	Sun Jul  7 18:36:06 1996
++++ libidu/Makefile.am
+@@ -2,9 +2,9 @@
+ 
+ AUTOMAKE_OPTIONS = ansi2knr
+ 
+-noinst_LIBRARIES = idu
++noinst_LIBRARIES = libidu.a
+ 
+-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
+ 
+ idudir = $(prefix)/share
diff --git a/devel/id-utils/patches/patch-ag b/devel/id-utils/patches/patch-ag
new file mode 100644
index 00000000000..e28f4fa5847
--- /dev/null
+++ b/devel/id-utils/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 2001/08/04 09:52:27 wiz 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
+ 
+-noinst_LIBRARIES = sys
++noinst_LIBRARIES = libsys.a
+ 
+ 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@
diff --git a/devel/id-utils/patches/patch-ah b/devel/id-utils/patches/patch-ah
new file mode 100644
index 00000000000..a89ece0e77f
--- /dev/null
+++ b/devel/id-utils/patches/patch-ah
@@ -0,0 +1,72 @@
+$NetBSD: patch-ah,v 1.1 2001/08/04 09:52:28 wiz 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 ###############################