From owner-ports-jp@jp.freebsd.org  Thu Jul 29 03:15:17 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id DAA30675;
	Thu, 29 Jul 1999 03:15:17 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from dolphin.be.to (point1.be.to [210.235.212.29])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id DAA30670
	for <ports-jp@jp.FreeBSD.org>; Thu, 29 Jul 1999 03:15:17 +0900 (JST)
	(envelope-from okazaki@be.to)
Received: from acidrain (mbra0128.ppp.infoweb.ne.jp [202.219.229.92])
	by dolphin.be.to (8.8.8+3.0Wbeta13/BETO.1.6-1999072520000000) with SMTP id DAA18247
	for <ports-jp@jp.FreeBSD.org>; Thu, 29 Jul 1999 03:15:14 +0900
Received: (qmail 812 invoked from network); 28 Jul 1999 18:14:16 -0000
Received: from localhost (HELO acidrain.localnet) (127.0.0.1)
  by localhost with SMTP; 28 Jul 1999 18:14:16 -0000
Date: Thu, 29 Jul 1999 03:14:14 +0900
Message-ID: <14239.18550.255748.26482Z@dolphin.be.to>
From: OKAZAKI Tetsurou <okazaki@be.to>
To: ports-jp@jp.FreeBSD.org
User-Agent: Wanderlust/2.1.0 (Ordinary World) SEMI/1.13.5
 (=?ISO-8859-4?Q?Meih=F2?=) Chao/1.13.0 (JR Fujinomori) Emacs/20.3
 (i386--freebsd) MULE/4.0 (HANANOEN)
Organization: Personal.
MIME-Version: 1.0 (generated by SEMI 1.13.5 -
 =?ISO-8859-4?Q?=22Meih=F2=22?=)
Content-Type: multipart/mixed;
 boundary="Multipart_Thu_Jul_29_03:14:14_1999-1"
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7063
Subject: [ports-jp 7063] [Update] editors/emacs20-dl (emacs-dl-20.4)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: okazaki@be.to

--Multipart_Thu_Jul_29_03:14:14_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

$B2,:j$G$9!#(B

$BB3$$$F!"(Bports-current $B$N(B editors/emacs20-dl $B$r(B emacs-20.4
$BBP1~$K$9$k%Q%C%A$G$9!#(Bpatches/patch-ba $B$O6u$K$J$k$N$G(B
$B>C$7$F$/$@$5$$!#(B($B8@$&$^$G$b$J$$$G$9$,(B)$B$3$l$b(B
ports/12779: Update port: editors/emacs20
$B$r@h$K%$%s%9%H!<%k$7$F$*$/I,MW$,$"$j$^$9!#(B

portlint $B$H(B make install $B!"$=$7$F4JC1$JF0:n%A%'%C%/(B
$B$7$+$7$F$^$;$s!#(B

$B$H$3$m$G!"(Bemacs-20.x $B$H(B emacs-dl-20.x $B$H$G$O(B
DOC $B%U%!%$%k$N@5$7$$6&M-$O$G$-$J$$$N$G$7$g$&$+(B?
$B$b$7$=$&$J$i!"(Bemacs-dl-20.4 $BMQ$N(B DOC $B%U%!%$%k$b(B
$B%$%s%9%H!<%k$7$?J}$,$$$$$N$+$b$7$l$J$$$G$9$M!#(B



--Multipart_Thu_Jul_29_03:14:14_1999-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="emacs20-dl-20.3-20.4-port.diff"
Content-Transfer-Encoding: 7bit

diff -urN /usr/ports/editors/emacs20-dl/Makefile emacs20-dl/Makefile
--- /usr/ports/editors/emacs20-dl/Makefile	Sun Mar 14 17:27:44 1999
+++ emacs20-dl/Makefile	Wed Jul 28 21:30:50 1999
@@ -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.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 -urN /usr/ports/editors/emacs20-dl/files/md5 emacs20-dl/files/md5
--- /usr/ports/editors/emacs20-dl/files/md5	Sun Dec 13 23:27:06 1998
+++ emacs20-dl/files/md5	Wed Jul 28 21:31:04 1999
@@ -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 -urN /usr/ports/editors/emacs20-dl/patches/patch-ba emacs20-dl/patches/patch-ba
--- /usr/ports/editors/emacs20-dl/patches/patch-ba	Sun Dec 13 23:27:06 1998
+++ emacs20-dl/patches/patch-ba	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- lib-src/emacsclient.c.orig	Thu Apr  9 02:29:18 1998
-+++ lib-src/emacsclient.c	Fri Oct  9 23:31:23 1998
-@@ -225,6 +225,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
---- lib-src/emacsserver.c.orig	Mon Apr  6 19:18:22 1998
-+++ lib-src/emacsserver.c	Fri Oct  9 23:31:23 1998
-@@ -251,6 +251,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
diff -urN /usr/ports/editors/emacs20-dl/patches/patch-cb emacs20-dl/patches/patch-cb
--- /usr/ports/editors/emacs20-dl/patches/patch-cb	Mon Mar  1 03:05:05 1999
+++ emacs20-dl/patches/patch-cb	Wed Jul 28 21:05:15 1999
@@ -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 -urN /usr/ports/editors/emacs20-dl/patches/patch-cc emacs20-dl/patches/patch-cc
--- /usr/ports/editors/emacs20-dl/patches/patch-cc	Sun Jan 24 11:47:16 1999
+++ emacs20-dl/patches/patch-cc	Wed Jul 28 21:05:15 1999
@@ -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 ;;

--Multipart_Thu_Jul_29_03:14:14_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

-- 
$B2,:j(B $BE/O/(B
--Multipart_Thu_Jul_29_03:14:14_1999-1--
