Build elc files ourselves, so that one package can support emacs and

xemacs.

devel/id-utils/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 1999/09/29 00:43:46 espie Exp $
+# $OpenBSD: Makefile,v 1.10 1999/10/07 16:02:55 espie Exp $
 
 DISTNAME=	id-utils-3.2d
 CATEGORIES=	devel
@@ -8,27 +8,55 @@ MAINTAINER=	ports@OpenBSD.ORG
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/ \
 		ftp://ftp.enst.fr/pub/gnu/gnits/
 
-.if defined(WITH_EMACS) && ${WITH_EMACS}==emacs
-# need to byte-compile a .el file
-#
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
-PKGNAME=${DISTNAME}-emacs
-CONFIGURE_ARGS+=--with-emacs
-PLIST=${PKGDIR}/PLIST.emacs
-.elsif defined(WITH_EMACS) && ${WITH_EMACS}==xemacs
-BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs
-PKGNAME=${DISTNAME}-xemacs
-CONFIGURE_ARGS+=--with-emacs=xemacs
-PLIST=${PKGDIR}/PLIST.xemacs
-.else
+# take over the management of emacs file, as the current process is abysmal.
 CONFIGURE_ARGS=--without-emacs
+PKGNAME=${DISTNAME}
+.if defined(WITHOUT_EMACS)
+PKGNAME:=${PKGNAME}-noemacs
+.else
+BUILD_DEPENDS+=	emacs:${PORTSDIR}/editors/emacs
 .endif
+.if defined(WITHOUT_XEMACS)
+PKGNAME:=${PKGNAME}-noxemacs
+.else
+BUILD_DEPENDS+=	xemacs:${PORTSDIR}/editors/xemacs
+.endif
+PLIST=${WRKBUILD}/PLIST
+
+post-build:
+.if !defined(WITHOUT_EMACS)
+	mkdir -p ${WRKBUILD}/elisp
+	cd ${WRKBUILD}/elisp && ln -s -f ${WRKSRC}/lisp/id-utils.el && \
+	EMACS=emacs ${SHELL} ${WRKSRC}/lisp/elisp-comp id-utils.el
+.endif
+.if !defined(WITHOUT_XEMACS)
+	mkdir -p ${WRKBUILD}/xelisp
+	cd ${WRKBUILD}/xelisp && ln -s -f ${WRKSRC}/lisp/id-utils.el && \
+	EMACS=xemacs ${SHELL} ${WRKSRC}/lisp/elisp-comp id-utils.el
+.endif
+
+pre-install:
+	@cp ${FILESDIR}/PLIST ${PLIST}
+.if !defined(WITHOUT_EMACS)
+	@echo "share/emacs/site-lisp/id-utils.el" >>${PLIST}
+	@echo "share/emacs/site-lisp/id-utils.elc" >>${PLIST}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKBUILD}/elisp/id-utils.el ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKBUILD}/elisp/id-utils.elc ${PREFIX}/share/emacs/site-lisp
+.endif
+.if !defined(WITHOUT_XEMACS)
+	@echo "lib/emacs/site-lisp/id-utils.el" >>${PLIST}
+	@echo "lib/emacs/site-lisp/id-utils.elc" >>${PLIST}
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/emacs/site-lisp
+	${INSTALL_DATA} ${WRKBUILD}/elisp/id-utils.el ${PREFIX}/lib/emacs/site-lisp
+	${INSTALL_DATA} ${WRKBUILD}/elisp/id-utils.elc ${PREFIX}/lib/emacs/site-lisp
+.endif
+	
 
 # International files don't want to be built separately
 #
 SEPARATE_BUILD=	simple
 GNU_CONFIGURE=	yes
-USE_AUTOCONF= yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>

devel/id-utils/patches/patch-aa

@@ -1,37 +1,11 @@
---- configure.in.orig	Wed Sep 29 00:58:44 1999
-+++ configure.in	Wed Sep 29 02:20:37 1999
-@@ -127,7 +127,33 @@ AC_SUBST(LANGUAGE_MAP_FILE)
- ################ Find a home for Emacs Lisp code #############################
- ##############################################################################
+--- Makefile.in.orig	Thu Oct  7 16:58:15 1999
++++ Makefile.in	Thu Oct  7 16:58:22 1999
+@@ -95,7 +95,7 @@
  
--AM_PATH_LISPDIR
-+AC_ARG_WITH([emacs], 
-+[  --with-emacs            check for emacs flavor], 
-+[ sublisp=lisp
-+if test "$withval" = "yes" -o "$withval" = "emacs"; then
-+	lispdir="\$(prefix)/share/emacs/site-lisp"
-+else
-+	if test "$withval" = "xemacs"; then
-+		lispdir="\$(prefix)/lib/xemacs/site-lisp"
-+	else
-+		if test "$withval" = "no"; then
-+			lispdir=
-+			sublisp=
-+		else
-+			AC_MSG_ERROR("Unknown value: --with-emacs=$withval")
-+		fi
-+	fi
-+fi
-+],
-+[
-+sublisp=
-+lispdir=
-+]
-+)
-+
-+AC_SUBST(lispdir)
-+
-+AC_SUBST(sublisp)
+ AUTOMAKE_OPTIONS = gnits 1.2h
  
- ##############################################################################
- ################ Generate the configure script ###############################
+-SUBDIRS = lib libidu intl src lisp m4 po doc testsuite
++SUBDIRS = lib libidu intl src m4 po doc testsuite
+ 
+ # Remove this file here (it is created via configure), not from within intl.
+ DISTCLEANFILES = intl/libintl.h

devel/id-utils/patches/patch-ab

@@ -1,16 +1,11 @@
---- Makefile.in.orig	Wed Sep 29 00:57:27 1999
-+++ Makefile.in	Wed Sep 29 01:17:49 1999
-@@ -91,11 +91,12 @@ USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- l = @l@
- lispdir = @lispdir@
-+sublisp = @sublisp@
+--- lisp/elisp-comp.orig	Thu Oct  7 16:57:37 1999
++++ lisp/elisp-comp	Thu Oct  7 16:58:03 1999
+@@ -34,7 +34,7 @@
+   cd $tempdir
  
+   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 ..
  
- AUTOMAKE_OPTIONS = gnits 1.2h
- 
--SUBDIRS = lib libidu intl src lisp m4 po doc testsuite
-+SUBDIRS = lib libidu intl src ${sublisp} m4 po doc testsuite
- 
- # Remove this file here (it is created via configure), not from within intl.
- DISTCLEANFILES = intl/libintl.h
+   cd ..

devel/id-utils/pkg/PLIST.emacs

@@ -1,17 +0,0 @@
-@unexec install-info --delete --info-dir=%D/info %D/info/id-utils.info
-bin/aid
-bin/defid
-bin/eid
-bin/fid
-bin/fnid
-bin/gid
-bin/lid
-bin/mkid
-bin/xtokid
-info/id-utils.info
-share/emacs/site-lisp/id-utils.el
-share/emacs/site-lisp/id-utils.elc
-share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
-@exec install-info --info-dir=%D/info %D/info/id-utils.info

devel/id-utils/pkg/PLIST.xemacs

@@ -1,17 +0,0 @@
-@unexec install-info --delete --info-dir=%D/info %D/info/id-utils.info
-bin/aid
-bin/defid
-bin/eid
-bin/fid
-bin/fnid
-bin/gid
-bin/lid
-bin/mkid
-bin/xtokid
-info/id-utils.info
-lib/emacs/site-lisp/id-utils.el
-lib/emacs/site-lisp/id-utils.elc
-share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
-@exec install-info --info-dir=%D/info %D/info/id-utils.info