Update to 20.4.

Obtained from:	OKAZAKI Tetsurou <okazaki@be.to>

5 files changed, 32 insertions, 36 deletions

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