From shige@kuis.kyoto-u.ac.jp Sun Feb 21 22:19:15 1999
Return-Path: <shige@kuis.kyoto-u.ac.jp>
Received: from spa.kuis.kyoto-u.ac.jp (lab4img2.kuis.kyoto-u.ac.jp [130.54.23.231])
	by hub.freebsd.org (Postfix) with ESMTP id A32F910F4E
	for <freebsd-gnats-submit@freebsd.org>; Sun, 21 Feb 1999 22:19:13 -0800 (PST)
	(envelope-from shige@kuis.kyoto-u.ac.jp)
Received: from kusatsu.kuis.kyoto-u.ac.jp (kusatsu [130.54.22.171])
	by spa.kuis.kyoto-u.ac.jp (8.8.8/3.7Wspa) with ESMTP id PAA02762;
	Mon, 22 Feb 1999 15:19:10 +0900 (JST)
Received: (from shige@localhost)
	by kusatsu.kuis.kyoto-u.ac.jp (8.9.2/3.6W) id PAA10136;
	Mon, 22 Feb 1999 15:16:41 +0900 (JST)
Message-Id: <199902220616.PAA10136@kusatsu.kuis.kyoto-u.ac.jp>
Date: Mon, 22 Feb 1999 15:16:41 +0900 (JST)
From: shige@kuis.kyoto-u.ac.jp
Reply-To: shige@kuis.kyoto-u.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Cc: shige@kuis.kyoto-u.ac.jp
Subject: Update port: editors/emacs20-dl
X-Send-Pr-Version: 3.2

>Number:         10192
>Category:       ports
>Synopsis:       Update port: editors/emacs20-dl
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 21 22:20:00 PST 1999
>Closed-Date:    Sun Feb 28 00:10:33 PST 1999
>Last-Modified:  Sun Feb 28 00:11:49 PST 1999
>Originator:     Shigeyuki FUKUSHIMA
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Dept. of Information Science, Kyoto Univ., JAPAN
>Environment:

	FreeBSD 4.0-CURRENT i386

>Description:

Update port: editors/emacs20-dl

Unbreak for 4.0-current.

Thank you.
--- shige

>How-To-Repeat:

>Fix:

diff -urN /usr/ports/editors/emacs20-dl/patches/patch-ah emacs20-dl/patches/patch-ah
--- /usr/ports/editors/emacs20-dl/patches/patch-ah	Thu Jan  1 09:00:00 1970
+++ emacs20-dl/patches/patch-ah	Mon Feb 22 15:15:39 1999
@@ -0,0 +1,29 @@
+--- lib-src/Makefile.in.orig	Sat Aug  1 20:22:55 1998
++++ lib-src/Makefile.in	Sat Feb 13 17:30:37 1999
+@@ -218,7 +218,7 @@
+ LIBMAIL=-lmail
+ #endif
+ 
+-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
++LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC -lcompat
+ 
+ /* We need to #define emacs to get the right versions of some files.
+    Some other files - those shared with other GNU utilities - need
+@@ -278,7 +278,7 @@
+         if [ `(cd ${archlibdir} && /bin/pwd)` \
+              != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ 	  for file in ${SCRIPTS}; do \
+-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
++	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
+ 	  done ; \
+ 	fi
+ 
+@@ -290,7 +290,7 @@
+ 	  chmod a+rx ${bindir}/$${file}; \
+ 	done
+ 	for file in ${INSTALLABLE_SCRIPTS} ; do \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
++	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \
+ 	  chmod a+rx ${bindir}/$${file}; \
+ 	done
+ 

>Release-Note:
>Audit-Trail:

From: Takayuki TAMURA <ttathome@remus.dti.ne.jp>
To: shige@kuis.kyoto-u.ac.jp
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/10192: Update port: editors/emacs20-dl
Date: Sun, 28 Feb 1999 16:27:02 +0900

 ----Next_Part(Sun_Feb_28_16:21:10_1999_518)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 The breakage of emacs20 and emacs20-dl under 4.0-current concerning
 `fakemail' is due to missing definition of `BSD_SYSTEM' in
 "src/s/freebsd.h".
 Try adding the following to the file as done in the attached patch
 file rather than resort to -lcompat.
 
 	#elif __FreeBSD__ == 4
 	#define BSD_SYSTEM 199901
 
 Regards,
 --------
 Takayuki TAMURA
 ttathome@remus.dti.ne.jp
 
 ----Next_Part(Sun_Feb_28_16:21:10_1999_518)--
 Content-Type: Text/Plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=emacs20-dl-patch
 
 --- editors/emacs20-dl/patches/patch-cb.orig	Sat Jan 23 23:28:25 1999
 +++ editors/emacs20-dl/patches/patch-cb	Sun Feb 28 16:18:23 1999
 @@ -1,5 +1,5 @@
  --- src/s/freebsd.h.orig	Wed Aug 19 16:25:36 1998
 -+++ src/s/freebsd.h	Sun Jan  3 20:56:02 1999
 ++++ src/s/freebsd.h	Fri Feb 12 22:27:28 1999
  @@ -45,6 +45,13 @@
   #define LIBS_SYSTEM -lutil
   #define LIBS_TERMCAP -ltermcap
 @@ -32,3 +32,12 @@
   #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
 
 ----Next_Part(Sun_Feb_28_16:21:10_1999_518)----
 
State-Changed-From-To: open->closed 
State-Changed-By: shige 
State-Changed-When: Sun Feb 28 00:10:33 PST 1999 
State-Changed-Why:  
Committed. Thanks! 
>Unformatted:
