From 83cf5c71efff4a384aef51e91379d3744b2be10a Mon Sep 17 00:00:00 2001 From: Gary Jennejohn Date: Sat, 25 Dec 1999 12:34:09 +0000 Subject: [PATCH] Update to version 21.1.8. This change adds a framework so that xemacs21 can be used as the base port for the various xemacs-mule incarnations. This functionality has not been tested by the committer !!! Fixed up some fatal errors found by portlint. The submitter added compface.1 to LIB_DEPENDS, but the maintainer did not agree, so it has been eliminated. Version 21.1.8 removed all the empty directories which were created by version 21.1.7, so I had to modify PLIST accordingly. That explains the large number of changes to PLIST. This version does not seem to suffer from the "make world under -current and xemacs core dumps" syndrome. Submitted by: kiri@pis.toba-cmt.ac.jp Approved by: maintainer --- editors/xemacs-devel/Makefile | 39 +- editors/xemacs-devel/distinfo | 6 +- editors/xemacs-devel/files/patch-af | 12 +- editors/xemacs-devel/pkg-plist | 1206 ++++++++++++--------------- editors/xemacs/Makefile | 39 +- editors/xemacs/distinfo | 6 +- editors/xemacs/files/patch-af | 12 +- editors/xemacs/pkg-plist | 1206 ++++++++++++--------------- editors/xemacs21/Makefile | 39 +- editors/xemacs21/distinfo | 6 +- editors/xemacs21/files/patch-af | 12 +- editors/xemacs21/pkg-plist | 1206 ++++++++++++--------------- 12 files changed, 1644 insertions(+), 2145 deletions(-) diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 631d91fa0baa..0f3ade21d2b9 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -6,33 +6,36 @@ # $FreeBSD$ # -DISTNAME= xemacs-21.1.7 -PKGNAME= xemacs-21.1 +DISTNAME= xemacs-${XEMACS_VER} +PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1 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-${XEMACS_REL}/ \ + ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX} 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 \ 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 +45,18 @@ CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --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 +80,23 @@ WITH_DIALOGS= --with-dialogs=athena 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 --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo index a71193d0431f..6d5df79675fd 100644 --- a/editors/xemacs-devel/distinfo +++ b/editors/xemacs-devel/distinfo @@ -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 --git a/editors/xemacs-devel/files/patch-af b/editors/xemacs-devel/files/patch-af index 95171887c7e8..e3c02b1280e4 100644 --- a/editors/xemacs-devel/files/patch-af +++ b/editors/xemacs-devel/files/patch-af @@ -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 </dev/null || true diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 631d91fa0baa..0f3ade21d2b9 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -6,33 +6,36 @@ # $FreeBSD$ # -DISTNAME= xemacs-21.1.7 -PKGNAME= xemacs-21.1 +DISTNAME= xemacs-${XEMACS_VER} +PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1 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-${XEMACS_REL}/ \ + ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX} 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 \ 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 +45,18 @@ CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --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 +80,23 @@ WITH_DIALOGS= --with-dialogs=athena 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 --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index a71193d0431f..6d5df79675fd 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -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 --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af index 95171887c7e8..e3c02b1280e4 100644 --- a/editors/xemacs/files/patch-af +++ b/editors/xemacs/files/patch-af @@ -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 </dev/null || true diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile index 631d91fa0baa..0f3ade21d2b9 100644 --- a/editors/xemacs21/Makefile +++ b/editors/xemacs21/Makefile @@ -6,33 +6,36 @@ # $FreeBSD$ # -DISTNAME= xemacs-21.1.7 -PKGNAME= xemacs-21.1 +DISTNAME= xemacs-${XEMACS_VER} +PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1 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-${XEMACS_REL}/ \ + ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \ + ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX} 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 \ 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 +45,18 @@ CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --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 +80,23 @@ WITH_DIALOGS= --with-dialogs=athena 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 --git a/editors/xemacs21/distinfo b/editors/xemacs21/distinfo index a71193d0431f..6d5df79675fd 100644 --- a/editors/xemacs21/distinfo +++ b/editors/xemacs21/distinfo @@ -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 --git a/editors/xemacs21/files/patch-af b/editors/xemacs21/files/patch-af index 95171887c7e8..e3c02b1280e4 100644 --- a/editors/xemacs21/files/patch-af +++ b/editors/xemacs21/files/patch-af @@ -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 </dev/null || true