Update 1.94.1 -> 1.94.2. Use bsd.emacs.mk.

12 files changed, 185 insertions, 88 deletions

diff --git a/mail/mew/files/dot.emacs.el.tmpl b/mail/mew/files/dot.emacs.el.in
index 8cfe348595fa..8cfe348595fa 100644
--- a/mail/mew/files/dot.emacs.el.tmpl
+++ b/mail/mew/files/dot.emacs.el.in
diff --git a/mail/mew/files/message.sh b/mail/mew/files/message.sh
index c2720cc73d73..a709991a5b4f 100644
--- a/mail/mew/files/message.sh
+++ b/mail/mew/files/message.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
  
-if [ -z "${SITE_STARTUP_FILE}" ]; then
-    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+if [ -z "${EMACS_SETUPEL}" ]; then
+    cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
@@ -12,11 +12,11 @@ if [ -z "${SITE_STARTUP_FILE}" ]; then
 *************************************************************************
 EOF
 else
-    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+    cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-${EMACS_PORT_NAME}-startup)                                  *
+*       (require '`basename ${EMACS_SETUPEL} .el`)                                  *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff --git a/mail/mew/files/mew-setup.el.in b/mail/mew/files/mew-setup.el.in
new file mode 100644
index 000000000000..e408ef6eb6e7
--- /dev/null
+++ b/mail/mew/files/mew-setup.el.in
@@ -0,0 +1,4 @@
+(setq load-path (append '(
+	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
+ ) load-path))
+(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew/files/mew-startup.el.tmpl b/mail/mew/files/mew-startup.el.tmpl
deleted file mode 100644
index e0c7a1db42d3..000000000000
--- a/mail/mew/files/mew-startup.el.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-(setq load-path (cons "%%ELISPDIR%%" load-path))
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
diff --git a/mail/mew/files/mew-xemacs-setup.el.in b/mail/mew/files/mew-xemacs-setup.el.in
new file mode 100644
index 000000000000..feb0d538d7d5
--- /dev/null
+++ b/mail/mew/files/mew-xemacs-setup.el.in
@@ -0,0 +1,5 @@
+(setq load-path (append '(
+	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
+ ) load-path))
+(setq mew-icon-directory "%%LOCALBASE%%/%%EMACS_LIBDIR%%/etc/mew")
+(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew/files/mew-xemacs-startup.el.tmpl b/mail/mew/files/mew-xemacs-startup.el.tmpl
deleted file mode 100644
index a78dc54520e9..000000000000
--- a/mail/mew/files/mew-xemacs-startup.el.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-(setq load-path (cons "%%ELISPDIR%%" load-path))
-(setq mew-icon-directory "%%ETCDIR%%")
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
diff --git a/mail/mew/files/patch-aa b/mail/mew/files/patch-aa
index cd5eb362c550..07d51807b839 100644
--- a/mail/mew/files/patch-aa
+++ b/mail/mew/files/patch-aa
@@ -1,80 +1,172 @@
---- Makefile~	Wed Oct 20 20:20:51 1999
-+++ Makefile	Fri Dec 10 22:42:06 1999
-@@ -88,12 +88,29 @@
+--- Makefile.orig	Wed Oct 20 20:20:51 1999
++++ Makefile	Tue Jul 10 23:35:24 2001
+@@ -19,8 +19,8 @@
+ ## EDIT THE FOLLOWINGS
+ ##
+ 
+-PREFIX = /usr/local
+-INFODIR = $(PREFIX)/info
++PREFIX?= /usr/local
++INFODIR= $(PREFIX)/info
+ 
+ ##
+ ## Compile engines
+@@ -30,10 +30,10 @@
+ CFLAGS = -O
+ 
+ #EMACS = emacs
+-EMACS = xemacs
++EMACS=	${EMACS_CMD}
+ #EMACS = mule
+ 
+-PERL=`which perl`
++PERL?=`which perl`
+ #PERL=/usr/local/bin/perl
+ 
+ ##
+@@ -46,7 +46,7 @@
+ ## A directory where mew*.el[c] will be installed.
+ ##
+ 
+-ELISPDIR  = $(PREFIX)/lib/$(EMACS)/site-lisp
++ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/mew
+ #ELISPDIR = $(PREFIX)/share/emacs/site-lisp
+ #ELISPDIR = $(PREFIX)/lib/emacs
+ 
+@@ -54,7 +54,10 @@
+ ## A directory where etc file will be installed.
+ ##
+ 
+-ETCDIR = $(PREFIX)/lib/$(EMACS)/etc/Mew
++ETCDIR=	${PREFIX}/${EMACS_LIBDIR}/etc/mew
++
++# For XEmacs packages
++XPKGDIR=	${PREFIX}/${EMACS_PACKAGESDIR}
+ 
+ ################################################################
+ ##
+@@ -72,6 +75,8 @@
+ 	mew-virtual.elc  mew-highlight.elc mew-vars.elc  \
+ 	mew-addrbook.elc mew.elc
+ 
++OBJS_PKG=	 auto-autoloads.elc custom-load.elc
++
+ SRCS =  mew-attach.el   mew-bq.el      mew-cache.el   \
+ 	mew-complete.el mew-decode.el  mew-demo.el    \
+ 	mew-draft.el    mew-encode.el  mew-env.el     \
+@@ -88,6 +93,8 @@
  	mew-temacs.el   mew-xemacs.el  mew-addrbook.el \
  	mew.el
  
-+PIXMAPS=Mew.img	Mew.png	Mew.xbm	\
-+	Mew.xpm	mew-Audio.xpm	mew-Blank.xpm	\
-+	mew-External.xpm	mew-Folder.xpm	mew-Image.xpm	\
-+	mew-Octet-Stream.xpm	mew-Postscript.xpm	mew-Rfc822.xpm	\
-+	mew-Text.xpm	mew-Unknown.xpm	mew-Video.xpm	\
-+	mew-attach.xpm	mew-cite.xpm	mew-comp.xpm	\
-+	mew-forward.xpm	mew-inc.xpm	mew-next.xpm	\
-+	mew-pgp-enc.xpm	mew-pgp-sigenc.xpm	mew-pgp-sign.xpm	\
-+	mew-prev.xpm	mew-refile.xpm	mew-reply.xpm	\
-+	mew-send.xpm	mew-sep.xpm	mew-show.xpm	\
-+	mew-write.xpm	mew-yank.xpm
-+PIXMAPSETC=etc/COLOR	etc/mew-Plain.xpm	\
-+	etc/mew-curr.xpm	etc/mew-folder.xpm	etc/mew-inc2.xpm	\
-+	etc/mew-kill.xpm
-+
++SRCS_PKG=	auto-autoloads.el custom-load.el
 +
  TEMPFILE = temp.el
  
  CP = cp
- RM = rm -f
- MKDIR = mkdir -p
+@@ -96,14 +103,14 @@
  BIN = bin
-+ETC=	etc
  
  all: $(OBJS)
++
++$(OBJS): $(TEMPFILE) mew.el
  	@echo 'Compiling EL files of Mew ... '
-@@ -114,8 +131,8 @@
- 	-@if [ ! -d $(ELISPDIR) ]; then \
+ 	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
+ 	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
+ 	cd $(BIN); $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" PERL="$(PERL)"
+ 	@echo 'Compiling EL files of Mew ... done'
+ 
+-$(OBJS): $(TEMPFILE) mew.el
+-
+ $(TEMPFILE):
+ 	@echo '(setq load-path (cons "." load-path))' > $(TEMPFILE)
+ 	@echo '(defun mew-compile () (mapcar (function (lambda (x) (byte-compile-file x))) (list ' >> $(TEMPFILE)
+@@ -111,11 +118,11 @@
+ 	@echo ')))' >> $(TEMPFILE)
+ 
+ install: $(OBJS)
+-	-@if [ ! -d $(ELISPDIR) ]; then \
++	if [ ! -d $(ELISPDIR) ]; then \
  		$(MKDIR) $(ELISPDIR); \
- 	fi; \
+-	fi; \
 -	$(CP) $(SRCS) $(ELISPDIR)
 -	$(CP) $(OBJS) $(ELISPDIR)
++	fi
 +	${BSD_INSTALL_DATA} $(SRCS) $(ELISPDIR)
 +	${BSD_INSTALL_DATA} $(OBJS) $(ELISPDIR)
  	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
  
  clean:
-@@ -126,19 +143,32 @@
+@@ -126,19 +133,69 @@
  	cd info; $(MAKE) info EMACS=$(EMACS)
  
  install-info:
 -	cd info; $(MAKE) install-info INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-info INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
++	${MKDIR} ${INFODIR}
++	cd info; $(MAKE) install-info INFODIR=$(INFODIR) \
++		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
  
  jinfo::
  	cd info; $(MAKE) jinfo EMACS=$(EMACS)
  
  install-jinfo:
 -	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
++	${MKDIR} ${INFODIR}
++	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) \
++		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
 +
 +install-man:
++	${MKDIR} ${MANDIR}
 +	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
  
  install-etc:
- 	-@if [ ! -d $(ETCDIR) ]; then \
--		$(MKDIR) $(ETCDIR); \
-+		$(MKDIR) $(ETCDIR)/etc; \
+-	-@if [ ! -d $(ETCDIR) ]; then \
++	if [ ! -d $(ETCDIR) ]; then \
+ 		$(MKDIR) $(ETCDIR); \
  	fi; \
 -	cd etc; $(CP) -r * $(ETCDIR)/
-+	cd etc; \
-+	${BSD_INSTALL_DATA} ${PIXMAPS} ${ETCDIR}; \
-+	${BSD_INSTALL_DATA} ${PIXMAPSETC} ${ETCDIR}/etc
++	cd etc; $(CP) -R * $(ETCDIR)/
++
++package: ${OBJS} ${OBJS_PKG}
++
++${OBJS_PKG}: ${SRCS_PKG}
++	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
++		-f batch-byte-compile ${.ALLSRC}
++
++auto-autoloads.el : ${OBJS} _pkg.el
++	${EMACS} -vanilla -batch \
++		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
++		-l autoload -f batch-update-directory .
++	${RM} -f auto-autoloads.el~
++
++custom-load.el : ${OBJS}
++	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
++	if [ ! -f ${.TARGET} ]; then \
++		touch ${.TARGET}; \
++	fi
++
++_pkg.el:
++	@echo Creating _pkg.el
++	@echo ";;;###autoload" 				>  _pkg.el
++	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
++	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
++	@echo "		 :type 'regular)" 		>> _pkg.el
 +
++install-package:
++	${MKDIR} ${XPKGDIR}/pkginfo
++	${MAKE} ELISPDIR=${XPKGDIR}/lisp/mew  	install
++	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} ${XPKGDIR}/lisp/mew
++	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
++						install-info
++	${MAKE} MANDIR=${XPKGDIR}/man/mew    	install-man
++	${MAKE} ETCDIR=${XPKGDIR}/etc/mew    	install-etc
++	(cd ${XPKGDIR}; \
++		ls -d1 lisp/mew/* info/mew.* man/mew/* etc/mew/* \
++			> ${XPKGDIR}/pkginfo/MANIFEST.mew)
++	${ECHO} "pkginfo/MANIFEST.mew" >> ${XPKGDIR}/pkginfo/MANIFEST.mew
 +
-+install-package: install install-info install-man install-etc
-+	${MKDIR} ${EMACSPKGDIR} ${PKG_PKGINFODIR}
-+	${ECHO} "pkginfo/MANIFEST.mew" > ${PKG_PKGINFODIR}/MANIFEST.mew
-+	find ${EMACSPKGDIR} -type f | sed -e "s,^${EMACSPKGDIR}/,," | \
-+		grep '^etc/mew/\|^info/mew\.\|^lisp/mew/\|^man/mew/' | \
-+		grep -v "pkginfo/MANIFEST.mew" >> ${PKG_PKGINFODIR}/MANIFEST.mew
++install-mule-package: install-package
++	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
++						install-jinfo
  
  ##
  ## End of Makefile
diff --git a/mail/mew/files/patch-ab b/mail/mew/files/patch-ab
index 1524e237e0cc..2dac86223770 100644
--- a/mail/mew/files/patch-ab
+++ b/mail/mew/files/patch-ab
@@ -1,6 +1,6 @@
---- bin/Makefile.orig	Tue Mar  2 12:05:21 1999
-+++ bin/Makefile	Mon Aug 30 22:50:21 1999
-@@ -21,16 +21,16 @@
+--- bin/Makefile~	Wed Oct 27 08:55:11 1999
++++ bin/Makefile	Tue Jul 10 01:06:02 2001
+@@ -22,7 +22,7 @@
  	$(CC) -o $@ $(OBJS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
@@ -9,8 +9,10 @@
  
  uumerge: uumerge.in
  	sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
- 
- install: $(PRG) $(OTH)
+@@ -32,10 +32,10 @@
+ 	-@if [ ! -d $(BINDIR) ]; then \
+ 		$(MKDIR) $(BINDIR); \
+ 	fi; \
 -	cp $(PRG) $(BINDIR)
 +	${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)
  	for f in $(ALT); do \
diff --git a/mail/mew/files/patch-ac b/mail/mew/files/patch-ac
index ee8b3c4d73a8..3efb03c40dd8 100644
--- a/mail/mew/files/patch-ac
+++ b/mail/mew/files/patch-ac
@@ -1,6 +1,6 @@
---- info/Makefile.orig	Wed Oct 20 20:20:56 1999
-+++ info/Makefile	Fri Dec 10 22:45:46 1999
-@@ -32,6 +32,7 @@
+--- info/Makefile~	Wed Oct 27 08:55:12 1999
++++ info/Makefile	Tue Jul 10 01:25:05 2001
+@@ -33,6 +33,7 @@
  
  INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
  JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2
@@ -8,28 +8,39 @@
  
  info::
  	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -55,8 +56,8 @@
- 	-@if [ ! -d $(INFODIR) ]; then \
+@@ -57,22 +58,32 @@
  		$(MKDIR) $(INFODIR); \
  	fi; \
--	cp $(INFO) $(INFODIR)
+ 	cp $(INFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
+-		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
+-	else \
+-		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
 +	${BSD_INSTALL_DATA} $(INFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
- 		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
- 	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-@@ -66,12 +67,17 @@
++	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
++		if [ -x "$(INSTALLINFO)" ]; then \
++			$(INSTALLINFO) mew.info $(INFODIR)/dir; \
++		else \
++			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++		fi; \
+ 	fi
+ 
+ install-jinfo:
  	-@if [ ! -d $(INFODIR) ]; then \
  		$(MKDIR) $(INFODIR); \
  	fi; \
 -	cp $(JINFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
+-		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
+-	else \
+-		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
 +	${BSD_INSTALL_DATA} $(JINFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
- 		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
- 	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
++		if [ -x "$(INSTALLINFO)" ]; then \
++			$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
++		else \
++			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++		fi; \
  	fi
 +
 +install-man:
diff --git a/mail/mew/files/DESCR.tmpl b/mail/mew/files/pkg-descr.tmpl
index 2590a86452bb..72644327fddb 100644
--- a/mail/mew/files/DESCR.tmpl
+++ b/mail/mew/files/pkg-descr.tmpl
@@ -9,12 +9,12 @@ and to make it easy to view and compose them. With Mew you can send a
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for %%EMACS_CMD%%(%%PORTDIR%%). 
+This port is the Mew for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-%%PORTDIR%%(%%PKGNAME%%) ===> editors/%%EMACS_PORT_NAME%%(%%EMACS_CMD%%) 
+mail/%%PORTNAME%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
 	Lisp directory : %%ELISPDIR%%
 	Info directory : %%INFODIR%%
 	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew/files/tmpl2file.sh b/mail/mew/files/tmpl2file.sh
index 3a61fbc90014..ca169ce248c2 100644
--- a/mail/mew/files/tmpl2file.sh
+++ b/mail/mew/files/tmpl2file.sh
@@ -1,26 +1,14 @@
 #!/bin/sh
 
 for f in ${TMPL_FILES}; do
-	${SED} \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%EMACSDIR%%,${EMACSDIR},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		-e "s,%%PORTDIR%%,${PORTDIR},g" \
-		-e "s,%%SAMPLEDIR%%,${SAMPLEDIR},g" \
-		-e "s,%%REQUIRE%%,${REQUIRE},g" \
-		-e "s,%%AWK%%,${AWK},g" \
-		-e "s,%%CAT%%,${CAT},g" \
-		-e "s,%%CP%%,${CP},g" \
-		-e "s,%%ECHO%%,${ECHO},g" \
-		-e "s,%%MKDIR%%,${MKDIR},g" \
-		-e "s,%%RM%%,${RM},g" \
-		-e "s,%%SED%%,${SED},g" \
-		-e "s,%%TOUCH%%,${TOUCH},g" \
+	sed \
 		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
+		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
 		-e "s,%%PKGNAME%%,${PKGNAME},g" \
 		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%VERSION%%,${VERSION},g" \
+		-e "s,%%PORTNAME%%,${PORTNAME},g" \
+		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
+		-e "s,%%INFODIR%%,${INFODIR},g" \
+		-e "s,%%ETCDIR%%,${ETCDIR},g" \
 		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
 done
diff --git a/mail/mew/files/user-install.tmpl b/mail/mew/files/user-install.in
index ee1a7ad4d9f4..ee1a7ad4d9f4 100644
--- a/mail/mew/files/user-install.tmpl
+++ b/mail/mew/files/user-install.in