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

7 files changed, 189 insertions, 6 deletions

diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index fa04db98ff0..037aad73f04 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/17 08:38:43 abs Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/04 09:52:26 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -10,11 +10,58 @@ 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
-USE_LIBINTL=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.ifdef USE_XEMACS
+EMACS=			${LOCALBASE}/bin/xemacs
+BUILD_DEPENDS+=		xemacs-*:../editors/xemacs
+BUILD_DEPENDS+=		xemacs-packages-*:../editors/xemacs-packages
+.elifdef USE_EMACS
+EMACS=			${LOCALBASE}/bin/emacs
+BUILD_DEPENDS+=		emacs-*:../../editors/emacs
+.endif
+
+# we end-up installing .el file there whenever we use emacs or xemacs
+LISPDIR?=		share/emacs/site-lisp
+# install byte-compiled file here whenever we use emacs or xemacs...
+.if defined(USE_EMACS) || defined(USE_XEMACS)
+CLISPDIR=		${LISPDIR}
+.else
+# ...or don't install it at all
+CLISPDIR?=		'@comment '
+.endif
+# if not already, set this to the *full* pathname to false command
+# so configure won't search further for emacs
+EMACS?=			${FALSE:S|^false$|/usr/bin/false|}
+
+CONFIGURE_ENV+=		EMACS=${EMACS}
+BUILD_DEFS+=		EMACS
+
+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/distinfo b/devel/id-utils/distinfo
index 14c855b95be..c9ac8873cb2 100644
--- a/devel/id-utils/distinfo
+++ b/devel/id-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/04 09:52:27 wiz Exp $
 
 SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5
 Size (id-utils-3.2.tar.gz) = 388012 bytes
@@ -6,3 +6,7 @@ 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
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 ###############################
diff --git a/devel/id-utils/pkg/PLIST b/devel/id-utils/pkg/PLIST
index f810278297d..c3391a33d04 100644
--- a/devel/id-utils/pkg/PLIST
+++ b/devel/id-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/02/11 19:17:30 tv Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/08/04 09:52:28 wiz Exp $
 bin/mkid
 bin/lid
 bin/fid
@@ -12,5 +12,7 @@ bin/defid
 info/id-utils.info
 @exec install-info %D/info/id-utils.info %D/info/dir
 share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/id-utils.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/id-utils.mo
+${CLISPDIR}/id-utils.elc
+${LISPDIR}/id-utils.el