From owner-freebsd-ports Fri Dec 10 0:51:29 1999 Delivered-To: freebsd-ports@freebsd.org Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77]) by hub.freebsd.org (Postfix) with ESMTP id 0BC1015176; Fri, 10 Dec 1999 00:50:43 -0800 (PST) (envelope-from kiri@pis.toba-cmt.ac.jp) Received: from kiri.pis (localhost [127.0.0.1]) by pis.toba-cmt.ac.jp (8.9.3/8.9.3) with ESMTP id RAA59354; Fri, 10 Dec 1999 17:48:25 +0900 (JST) (envelope-from kiri@pis.toba-cmt.ac.jp) Message-Id: <199912100848.RAA59354@pis.toba-cmt.ac.jp> Date: Fri, 10 Dec 1999 17:48:24 +0900 From: kiri@pis.toba-cmt.ac.jp To: ports@FreeBSD.org, me@FreeBSD.org User-Agent: Wanderlust/1.0.3 (Notorious) SEMI/1.13.3 (Komaiko) FLIM/1.12.5 (Hirahata) MULE XEmacs/21.1 (patch 8) (Bryce Canyon) (i386--freebsd) Subject: editors/xemacs21 merged (1/2) MIME-Version: 1.0 (split by SEMI 1.13.3 - "Komaiko") Content-Type: message/partial; id="Fri_Dec_10_17:48:24_1999@kiri.pis"; number=1; total=2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org From: kiri@pis.toba-cmt.ac.jp To: ports@freebsd.org,me@FreeBSD.org Subject: editors/xemacs21 merged User-Agent: Wanderlust/1.0.3 (Notorious) SEMI/1.13.3 (Komaiko) FLIM/1.12.5 (Hirahata) MULE XEmacs/21.1 (patch 8) (Bryce Canyon) (i386--freebsd) MIME-Version: 1.0 (generated by SEMI 1.13.3 - "Komaiko") Content-Type: multipart/mixed; boundary="Multipart_Fri_Dec_10_17:48:24_1999-1" --Multipart_Fri_Dec_10_17:48:24_1999-1 Content-Type: text/plain; charset=US-ASCII Hi, all. I've merged editors/xemacs21 and editors/xemacs-mule* and also up to 21.1.8 :) Bascically editors/xemacs21 has not been changed(almost varibles used in it not changed too), but some variables which uses in mule ports should be used in it. All variables used in xemacs21 for mule specific are as follows: MULE_PORT : Mule port if defined(means COMMN or SLAVE) MULE_COMMON : COMMON port if defined MULE_SLAVE : SLAVE port if defined If anyone has no objections against my presentation, I'll be send-pr this as well as other addtional mule ports. # I've already contacted xemacs21 MAINTAINER(Michael # Elbel),but nothing replied ;) Thanks regards. --Multipart_Fri_Dec_10_17:48:24_1999-1 Content-Type: text/plain; charset=US-ASCII diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^#.*\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/Makefile ./Makefile --- /usr/ports/current/editors/xemacs21/Makefile Wed Nov 17 12:31:27 1999 +++ ./Makefile Mon Dec 6 16:39:31 1999 @@ -6,33 +6,38 @@ # $FreeBSD: ports/editors/xemacs21/Makefile,v 1.35 1999/11/16 21:14:37 gj Exp $ # -DISTNAME= xemacs-21.1.7 -PKGNAME= xemacs-21.1 -CATEGORIES= editors +DISTNAME= xemacs-${XEMACS_VER} +PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-${XEMACS_VER} +CATEGORIES?= editors MASTER_SITES= \ - ftp://ftp.xemacs.org/pub/xemacs/${PKGNAME}/ \ - ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${PKGNAME}/ \ - ftp://ftp.usyd.edu.au/pub/Xemacs/${PKGNAME}/ \ - ftp://ftp.lab.kdd.co.jp/xemacs/${PKGNAME}/ \ - ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${PKGNAME}/ + ftp://ftp.xemacs.org/pub/xemacs/${XEMACS_REL}/ \ + ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${XEMACS_REL}/ \ + ftp://ftp.usyd.edu.au/pub/Xemacs/${XEMACS_REL}/ \ + ftp://ftp.lab.kdd.co.jp/xemacs/${XEMACS_REL}/ \ + ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${XEMACS_REL}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX} -MAINTAINER= me@FreeBSD.org +MAINTAINER?= me@FreeBSD.org -RUN_DEPENDS= ${PREFIX}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ +.if !defined(MULE_COMMON) +RUN_DEPENDS+= ${PREFIX}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages +LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png \ + compface.1:${PORTSDIR}/mail/faces \ tiff.4:${PORTSDIR}/graphics/tiff +.endif -XEMACS_VER= 21.1.7 +XEMACS_REL= 21.1 +XEMACS_VER= 21.1.8 DIST_SUBDIR= xemacs +USE_XLIB= yes USE_GMAKE= yes STRIP= HAS_CONFIGURE= yes XEMACS_ARCH= ${MACHINE_ARCH}--freebsd -CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ +CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ @@ -42,12 +47,18 @@ --with-png=yes \ --with-tiff=yes \ ${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} +MAKE_ARGS= prefix=${PREFIX} +.if !defined(MULE_SLAVE) MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +.endif +.if !defined(MULE_PORT) ALL_TARGET= all dist +.endif PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} +.if !defined(MULE_PORT) pre-fetch: @${ECHO_MSG} "If you want the MULE features, please use the xemacs-mule port" .if defined(HAVE_MOTIF) @@ -71,17 +82,23 @@ WITH_XFACE?= --with-xface=no WITH_OFFIX?= --with-offix=no .endif +.endif -post-install: +post-install:: +.if !defined(MULE_COMMON) ${LN} -sf xemacs-${XEMACS_VER} ${PREFIX}/bin/xemacs21 .for file in b2m ctags etags gnuclient xemacs-${XEMACS_VER} strip ${PREFIX}/bin/${file} .endfor +.endif +.if !defined(MULE_SLAVE) # ``make install'' does not set the permissions like pkg_add does. + ${MKDIR} /var/run/emacs/lock ${CHMOD} 1777 /var/run/emacs/lock ${RM} -f ${PREFIX}/bin/send-pr # install xemacs21.sh into ${PREFIX}/etc/rc.d @if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi ${INSTALL_SCRIPT} ${FILESDIR}/xemacs21.sh ${PREFIX}/etc/rc.d +.endif .include diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^#.*\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/files/md5 ./files/md5 --- /usr/ports/current/editors/xemacs21/files/md5 Thu Oct 21 12:31:41 1999 +++ ./files/md5 Mon Dec 6 16:31:42 1999 @@ -1,3 +1,3 @@ -MD5 (xemacs/xemacs-21.1.7.tar.gz) = c251da17e7aadaabaa3ffdfff56ac4a9 -MD5 (xemacs/xemacs-21.1.7-elc.tar.gz) = 13efe35dcf9d40f7b43f6783a32af88d -MD5 (xemacs/xemacs-21.1.7-info.tar.gz) = 736e211486583994fdb2bda584bf5f9c +MD5 (xemacs/xemacs-21.1.8.tar.gz) = d6b55722307fd2f09c916439354f4282 +MD5 (xemacs/xemacs-21.1.8-elc.tar.gz) = 6102d59e743f6517e2a867c3abf6c715 +MD5 (xemacs/xemacs-21.1.8-info.tar.gz) = 0fb0b3ceb1d552f9faf11f2a3f2d39bb diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^#.*\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/patches/patch-af ./patches/patch-af --- /usr/ports/current/editors/xemacs21/patches/patch-af Sat Nov 27 12:31:31 1999 +++ ./patches/patch-af Mon Dec 6 00:10:07 1999 @@ -1,19 +1,19 @@ ---- configure~ Fri Oct 8 15:34:48 1999 -+++ configure Fri Oct 8 15:36:43 1999 +--- configure.orig Wed Nov 3 08:42:56 1999 ++++ configure Mon Dec 6 00:03:25 1999 @@ -1038,6 +1038,7 @@ case "$canonical" in *-*-linux* ) opsys=linux ;; + *-*-freebsd* ) opsys=freebsd ;; *-*-netbsd* ) opsys=netbsd ;; - *-*-openbsd* ) opsys=openbsd ;; + *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -11108,7 +11108,7 @@ +@@ -11178,7 +11179,7 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 - echo "configure:11111: checking for Berkeley db.h" >&5 + echo "configure:11181: checking for Berkeley db.h" >&5 - for path in "db/db.h" "db.h"; do + for path in "/usr/include/db.h" "db/db.h" "db.h"; do cat > conftest.$ac_ext <