From 07e0162344f74241c72a8afe540daeb961d5634f Mon Sep 17 00:00:00 2001 From: Gary Jennejohn Date: Thu, 17 Feb 2000 21:38:02 +0000 Subject: Update to version 21.1.9. As in ver. 21.1.7 the port creates lots of empty directories. This must be reflected in PLIST, which explains the big diff. I wish they'd make up their minds :-) Tested on i386 and Alpha. Also tested packaging. Submitted by: kiri@pis.toba-cmt.ac.jp --- editors/xemacs/Makefile | 22 +- editors/xemacs/distinfo | 6 +- editors/xemacs/files/patch-af | 12 +- editors/xemacs/pkg-plist | 1119 ++++++++++++++++++++++++----------------- 4 files changed, 679 insertions(+), 480 deletions(-) (limited to 'editors/xemacs') diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index d4c5e354143f..2f7f452a9ed7 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -7,7 +7,7 @@ # DISTNAME= xemacs-${XEMACS_VER} -PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1 +PKGNAME= ${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1.9 CATEGORIES?= editors MASTER_SITES= \ ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \ @@ -25,7 +25,7 @@ LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \ tiff.4:${PORTSDIR}/graphics/tiff XEMACS_REL= 21.1 -XEMACS_VER= 21.1.8 +XEMACS_VER= 21.1.9 DIST_SUBDIR= xemacs USE_XLIB= yes @@ -37,8 +37,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ - --site-includes=${PREFIX}/include \ - --site-libraries=${PREFIX}/lib \ + --site-includes=${SITE_INCLUDES} \ + --site-libraries=${SITE_LIBRARIES} \ --with-session=yes \ --with-png=yes \ --with-tiff=yes \ @@ -98,3 +98,17 @@ post-install:: .endif .include + +# this makes it easier to test using PREFIX != LOCALBASE. Do not do +# this on bento. This has to go here because PREFIX and LOCALBASE are +# normally defined in bsd.port.mk. + +.if !defined(PACKAGE_BUILDING) +.if ${PREFIX} == ${LOCALBASE} +SITE_INCLUDES= ${PREFIX}/include +SITE_LIBRARIES= ${PREFIX}/lib +.else +SITE_INCLUDES= "${PREFIX}/include ${LOCALBASE}/include" +SITE_LIBRARIES= "${PREFIX}/lib ${LOCALBASE}/lib" +.endif +.endif diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 6d5df79675fd..a0200d20d1e8 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (xemacs/xemacs-21.1.9.tar.gz) = 9c39352ed2467a3a57339cb612054c85 +MD5 (xemacs/xemacs-21.1.9-elc.tar.gz) = dfb43552c15ceff6f011b764585e256a +MD5 (xemacs/xemacs-21.1.9-info.tar.gz) = 55c1fc50e5e39c9d9317e7366cef2519 diff --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af index e3c02b1280e4..419ab120233e 100644 --- a/editors/xemacs/files/patch-af +++ b/editors/xemacs/files/patch-af @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 3 08:42:56 1999 -+++ configure Mon Dec 6 00:03:25 1999 -@@ -1038,6 +1038,7 @@ +--- configure.orig Wed Feb 9 10:41:00 2000 ++++ configure Wed Feb 16 14:41:50 2000 +@@ -1040,6 +1040,7 @@ case "$canonical" in *-*-linux* ) opsys=linux ;; @@ -8,12 +8,12 @@ *-*-netbsd* ) opsys=netbsd ;; *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -11178,7 +11179,7 @@ +@@ -11180,7 +11181,7 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 - echo "configure:11181: checking for Berkeley db.h" >&5 + echo "configure:11183: 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 + -- cgit v1.2.3