From 2e703363eba2d318b69694a635a416bff9e2a8e4 Mon Sep 17 00:00:00 2001 From: gj Date: Thu, 14 Oct 1999 21:47:04 +0000 Subject: Keep up with the Joneses and update this port to version 21.1.6. Delete the MULE support and refer the user to the xemacs-mule port. Add --with-png=yes to the list of CONFIGURE_ARGS. The port now creates scads of empty directories which, hopefully, can be deleted if the package gets deleted. Tested install/deinstall and packaging. Requested by: the maintainer --- editors/xemacs-devel/Makefile | 19 ++----- editors/xemacs-devel/distinfo | 6 +-- editors/xemacs-devel/files/patch-af | 10 ++-- editors/xemacs-devel/pkg-plist | 98 ++++++++++++++++++++++++++++++++++++- editors/xemacs/Makefile | 19 ++----- editors/xemacs/distinfo | 6 +-- editors/xemacs/files/patch-af | 10 ++-- editors/xemacs/pkg-plist | 98 ++++++++++++++++++++++++++++++++++++- editors/xemacs21/Makefile | 19 ++----- editors/xemacs21/distinfo | 6 +-- editors/xemacs21/files/patch-af | 10 ++-- editors/xemacs21/pkg-plist | 98 ++++++++++++++++++++++++++++++++++++- 12 files changed, 327 insertions(+), 72 deletions(-) diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 807a751a3fea..d8dc67377baa 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= xemacs-21.1.2 +DISTNAME= xemacs-21.1.6 PKGNAME= xemacs-21.1 CATEGORIES= editors MASTER_SITES= \ @@ -24,7 +24,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png -XEMACS_VER= 21.1-p2 +XEMACS_VER= 21.1.6 DIST_SUBDIR= xemacs USE_GMAKE= yes @@ -38,18 +38,16 @@ CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --site-includes=${PREFIX}/include \ --site-libraries=${PREFIX}/lib \ --with-session=yes \ - ${WITH_XFACE} ${WITH_MULE} ${WITH_DIALOGS} ${WITH_OFFIX} + --with-png=yes \ + ${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -# Have pre-fetch: -.if !defined(USE_MULE) - @${ECHO_MSG} "To compile in the MULE features, set the environment variable USE_MULE" -.endif + @${ECHO_MSG} "If you want the MULE features, please use the xemacs-mule port" .if defined(HAVE_MOTIF) .if !defined(MOTIF_STATIC) @${ECHO_MSG} "" @@ -60,12 +58,6 @@ pre-fetch: .endif .endif -.if defined(USE_MULE) -WITH_MULE= --with-mule -# MULEDISTFILE= ${DISTNAME}-mule.tar.gz -# PLIST= ${PKGDIR}/PLIST.mule -.endif - # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) WITH_DIALOGS= --with-dialogs=athena @@ -85,7 +77,6 @@ post-install: .endfor # ``make install'' does not set the permissions like pkg_add does. ${CHMOD} 1777 /var/run/emacs/lock -# ${MKDIR} ${PREFIX}/lib/xemacs ${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 diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo index a6e377048c46..ca0e9b9fefbb 100644 --- a/editors/xemacs-devel/distinfo +++ b/editors/xemacs-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (xemacs/xemacs-21.1.2.tar.gz) = d6c3027d8efb56d265dda522392fa8bb -MD5 (xemacs/xemacs-21.1.2-elc.tar.gz) = 257d6043e6930004edba05ed74e75650 -MD5 (xemacs/xemacs-21.1.2-info.tar.gz) = cf4c2eba16e1342e6cc235590cfbfdac +MD5 (xemacs/xemacs-21.1.6.tar.gz) = f216ccf246d10771b65436fd45b50810 +MD5 (xemacs/xemacs-21.1.6-elc.tar.gz) = 5047ea121e8b972725bbeb2a197e4461 +MD5 (xemacs/xemacs-21.1.6-info.tar.gz) = 6d9bf4b1f51b278439fd3fbb7033c9b5 diff --git a/editors/xemacs-devel/files/patch-af b/editors/xemacs-devel/files/patch-af index dcf71c249c80..8d16648b8671 100644 --- a/editors/xemacs-devel/files/patch-af +++ b/editors/xemacs-devel/files/patch-af @@ -1,11 +1,11 @@ ---- configure.orig Wed May 26 06:28:12 1999 -+++ configure Wed May 26 06:28:08 1999 -@@ -11172,7 +11172,7 @@ +--- configure.orig Sun Aug 15 01:29:45 1999 ++++ configure Mon Sep 6 16:47:50 1999 +@@ -11104,7 +11104,7 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 - echo "configure:11175: checking for Berkeley db.h" >&5 + echo "configure:11107: 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 <&6 - echo "configure:11175: checking for Berkeley db.h" >&5 + echo "configure:11107: 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 <&6 - echo "configure:11175: checking for Berkeley db.h" >&5 + echo "configure:11107: 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 <