From 0ba224f81f24ce27dc27eab24fce8635573a2d9b Mon Sep 17 00:00:00 2001 From: Shigeyuki Fukushima Date: Mon, 9 Aug 1999 11:12:30 +0000 Subject: Update to 20.4. Obtained from: OKAZAKI Tetsurou --- editors/emacs20-dl/Makefile | 29 +++++++++++++++++------------ editors/emacs20-dl/distinfo | 4 ++-- editors/emacs20-dl/files/patch-cb | 13 ++----------- editors/emacs20-dl/files/patch-cc | 16 ++++++++-------- editors/emacs20-dl/pkg-descr | 6 +++--- editors/leim20/Makefile | 12 ++++++------ editors/leim20/distinfo | 2 +- editors/leim20/pkg-plist | 2 ++ 8 files changed, 41 insertions(+), 43 deletions(-) (limited to 'editors') diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index af4fc05e2299..5394697dcf83 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -1,36 +1,41 @@ # New ports collection makefile for: GNU emacs with dl -# Version required: 20.3 +# Version required: 20.4 # Date created: 10 October 1998 # Whom: shige # -# $Id: Makefile,v 1.6 1999/03/01 09:17:43 shige Exp $ +# $Id: Makefile,v 1.7 1999/03/08 07:28:23 asami Exp $ # -DISTNAME= emacs-20.3 -PKGNAME= emacs-dl-20.3 +DISTNAME= emacs-20.4 +PKGNAME= emacs-dl-20.4 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs -PATCH_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/ -PATCHFILES= emacs-20.3-dl.diff +PATCH_SITES= http://www.etl.go.jp/~tomo/comp/emacsen/ +PATCHFILES= emacs-20.4-dl.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= shige@FreeBSD.ORG -RUN_DEPENDS= emacs-20.3:${PORTSDIR}/editors/emacs20 +RUN_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20 USE_AUTOCONF= yes -USE_XLIB= yes USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" -EMACS_VER= 20.3 +EMACS_VER= 20.4 CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd -CONFIGURE_ARGS= ${EMACS_ARCH} --with-x-toolkit --with-pop +.if !defined(NO_X11) +CONFIGURE_ARGS= --with-x-toolkit --with-pop +USE_XLIB= yes +.else +CONFIGURE_ARGS= --with-x=no --with-pop +.endif + PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} -.if defined(USE_XPGLIB) -.if (${USE_XPGLIB} == "YES") +.if defined(USE_XPG4) +.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") CONFIGURE_ARGS+= --with-xpg4 .endif .endif diff --git a/editors/emacs20-dl/distinfo b/editors/emacs20-dl/distinfo index 87ba86165ea8..04de4a1cbd49 100644 --- a/editors/emacs20-dl/distinfo +++ b/editors/emacs20-dl/distinfo @@ -1,2 +1,2 @@ -MD5 (emacs-20.3.tar.gz) = 5aee43bb7c7267cc24b78011d280ecdc -MD5 (emacs-20.3-dl.diff) = 45e06de63c8bd8b272a7a3c517ad387f +MD5 (emacs-20.4.tar.gz) = 695614f204d918db617ba3ae849b273d +MD5 (emacs-20.4-dl.diff.gz) = 21c1a6b214efcef4cef975620a487681 diff --git a/editors/emacs20-dl/files/patch-cb b/editors/emacs20-dl/files/patch-cb index d5ae46309f02..28e6f9f1ae15 100644 --- a/editors/emacs20-dl/files/patch-cb +++ b/editors/emacs20-dl/files/patch-cb @@ -1,5 +1,5 @@ ---- src/s/freebsd.h.orig Wed Aug 19 16:25:36 1998 -+++ src/s/freebsd.h Fri Feb 12 22:27:28 1999 +--- src/s/freebsd.h.orig Tue Apr 13 03:22:12 1999 ++++ src/s/freebsd.h Sat Jul 24 01:30:10 1999 @@ -45,6 +45,13 @@ #define LIBS_SYSTEM -lutil #define LIBS_TERMCAP -ltermcap @@ -32,12 +32,3 @@ #undef LIB_GCC #define LIB_GCC -@@ -109,6 +123,8 @@ - #define BSD_SYSTEM 199306 - #elif __FreeBSD__ == 3 - #define BSD_SYSTEM 199506 -+#elif __FreeBSD__ == 4 -+#define BSD_SYSTEM 199901 - #endif - - #define WAITTYPE int diff --git a/editors/emacs20-dl/files/patch-cc b/editors/emacs20-dl/files/patch-cc index acc21ccdc46f..f643112fc00d 100644 --- a/editors/emacs20-dl/files/patch-cc +++ b/editors/emacs20-dl/files/patch-cc @@ -1,16 +1,16 @@ ---- configure.in.orig Wed Jul 1 07:15:05 1998 -+++ configure.in Sun Jan 3 21:44:02 1999 -@@ -57,6 +57,9 @@ - AC_ARG_WITH(gssapi, - [ --with-gssapi support GSSAPI-authenticated POP], - [AC_DEFINE(GSSAPI)]) +--- configure.in.orig Sun May 30 04:26:03 1999 ++++ configure.in Sat Jul 24 01:33:18 1999 +@@ -42,6 +42,9 @@ + AC_ARG_WITH(hesiod, + [ --with-hesiod support Hesiod to get the POP server host], + [AC_DEFINE(HESIOD)]) +AC_ARG_WITH(xpg4, +[ --with-xpg4 support XPG4 library on FreeBSD system], +[AC_DEFINE(USE_XPG)]) dnl This should be the last --with option, because --with-x is dnl added later on when we find the path of X, and it's best to dnl keep them together visually. -@@ -162,6 +165,15 @@ +@@ -147,6 +150,15 @@ machine='' opsys='' unported=no case "${canonical}" in @@ -26,7 +26,7 @@ ## NetBSD ports *-*-netbsd* ) opsys=netbsd -@@ -939,7 +951,6 @@ +@@ -943,7 +955,6 @@ ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr index 882457063638..71a293c749b9 100644 --- a/editors/emacs20-dl/pkg-descr +++ b/editors/emacs20-dl/pkg-descr @@ -1,12 +1,12 @@ GNU Emacs is a self-documenting, customizable, extensible real-time display editor (emacs binary only). -This package's emacs has a dynamic loading function. +This package's emacs has a dynamic loading module function. Emacs binary is: ${PREFIX}/bin/emacs-dl-${EMACS_VER} Dynamic loading patch: - ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/emacs-${EMACS_VER}-dl.diff + http://www.etl.go.jp/~tomo/comp/emacsen/emacs-${EMACS_VER}-dl.diff.gz ---- Port by shige@FreeBSD.ORG +--- Porting by shige@FreeBSD.ORG diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile index e4a5746c3c79..9ff0ef1fdb82 100644 --- a/editors/leim20/Makefile +++ b/editors/leim20/Makefile @@ -1,24 +1,24 @@ # New ports collection makefile for: LEIM for emacs20 -# Version required: 20.3 +# Version required: 20.4 # Date created: 10 September 1998 # Whom: Shigeyuki FUKUSHIMA # -# $Id: Makefile,v 1.2 1999/01/27 07:41:11 fenner Exp $ +# $Id: Makefile,v 1.3 1999/03/01 09:37:32 shige Exp $ # -DISTNAME= leim-20.3 +DISTNAME= leim-20.4 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs MAINTAINER= shige@FreeBSD.ORG -BUILD_DEPENDS= emacs-20.3:${PORTSDIR}/editors/emacs20 -RUN_DEPENDS= emacs-20.3:${PORTSDIR}/editors/emacs20 +BUILD_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20 +RUN_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20 USE_GMAKE= yes -EMACS_VER= 20.3 +EMACS_VER= 20.4 WRKSRC= ${WRKDIR}/emacs-${EMACS_VER}/leim PLIST_SUB= EMACS_VER=${EMACS_VER} SCRIPTS_ENV= EMACS_VER=${EMACS_VER} diff --git a/editors/leim20/distinfo b/editors/leim20/distinfo index 49221ece97f6..1d730e269250 100644 --- a/editors/leim20/distinfo +++ b/editors/leim20/distinfo @@ -1 +1 @@ -MD5 (leim-20.3.tar.gz) = 01e398c6eb437d387f222a04551e4070 +MD5 (leim-20.4.tar.gz) = c1506034117769b19945a6169911b0e3 diff --git a/editors/leim20/pkg-plist b/editors/leim20/pkg-plist index 85c319e9fdd9..58c625ebc317 100644 --- a/editors/leim20/pkg-plist +++ b/editors/leim20/pkg-plist @@ -55,6 +55,8 @@ share/emacs/%%EMACS_VER%%/leim/quail/hanja.el share/emacs/%%EMACS_VER%%/leim/quail/hanja.elc share/emacs/%%EMACS_VER%%/leim/quail/hanja3.el share/emacs/%%EMACS_VER%%/leim/quail/hanja3.elc +share/emacs/%%EMACS_VER%%/leim/quail/hebrew.el +share/emacs/%%EMACS_VER%%/leim/quail/hebrew.elc share/emacs/%%EMACS_VER%%/leim/quail/ipa.el share/emacs/%%EMACS_VER%%/leim/quail/ipa.elc share/emacs/%%EMACS_VER%%/leim/quail/japanese.el -- cgit v1.2.3