From owner-ports-jp@jp.freebsd.org  Mon Oct 22 21:44:49 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id VAA08703;
	Mon, 22 Oct 2001 21:44:49 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from e132109.ap.plala.or.jp (postfix@e132109.ap.plala.or.jp [202.229.132.109])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id VAA08698
	for <ports-jp@jp.freebsd.org>; Mon, 22 Oct 2001 21:44:48 +0900 (JST)
	(envelope-from sf@FreeBSD.org)
Received: from souffle.bogus-local.net (souffle.bogus-local.net [192.168.1.1])
	by e132109.ap.plala.or.jp (Postfix) with ESMTP id ADBA63B3
	for <ports-jp@jp.freebsd.org>; Mon, 22 Oct 2001 12:44:46 +0000 (GMT)
Date: Mon, 22 Oct 2001 21:44:46 +0900
Message-ID: <86ofmzrght.wl@gray.plala.or.jp>
From: FUJISHIMA Satsuki <sf@FreeBSD.org>
To: ports-jp@jp.freebsd.org
In-Reply-To: <867ktox7ho.wl@triton.nobutaka.com>
References: <86wv1oh8li.wl@triton.nobutaka.com>
	<wyzo6kcb4d.wl@eken3.eken.phys.nagoya-u.ac.jp>
	<867ktox7ho.wl@triton.nobutaka.com>
User-Agent: Wanderlust/2.7.5 (Too Funky) SEMI/1.14.3 (Ushinoya) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.3 Emacs/20.7 (i386--freebsd) MULE/4.1 (AOI)
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: multipart/mixed;
 boundary="Multipart_Mon_Oct_22_21:44:46_2001-1"
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 11479
Subject: [ports-jp 11479] Re: Emacs-21.1
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sf@FreeBSD.org

--Multipart_Mon_Oct_22_21:44:46_2001-1
Content-Type: text/plain; charset=ISO-2022-JP

19$B;~(B33$BJ,HG$+$i$N:9J,$G$9!%(B

o WITHOUT_X11$B$N;~$O(BLIB_DEPENDS$B$r30$7$^$7$?(B
o XPM$B$r;H$&;~$O(BUSE_XPM$B$7$^$;$&(B
o info$B$OJ,3d$;$L$,5H(B
o libxpg4$B$G8E$$(BFreeBSD$B$,9,$;(B
o share/emacs$B!$(Bshare/emacs/site-lisp$B$O(Bmtree$B$KF~$C$F$$$k$N$G>C$7$F$O$$(B
  $B$1$^$;$s(B

-- 
FUJISHIMA Satsuki


--Multipart_Mon_Oct_22_21:44:46_2001-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="emacs21.diff"
Content-Transfer-Encoding: 7bit

Index: Makefile
===================================================================
RCS file: /home/k5/share/src/cvs/emacs21/Makefile,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile
--- Makefile	22 Oct 2001 11:57:52 -0000	1.1.1.2
+++ Makefile	22 Oct 2001 12:39:48 -0000
@@ -18,25 +18,30 @@
 
 MAINTAINER=	nobutaka@nobutaka.com
 
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
-		Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png
+.endif
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=       ${MACHINE_ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if defined(WITHOUT_X11)
-CONFIGURE_ARGS= --with-x=no
+CONFIGURE_ARGS=		--with-x=no
 .else
-USE_XLIB=       yes
+USE_XLIB=	yes
+USE_XPM=	yes
 .endif
 
 MAN1=		ctags.1 emacs.1 etags.1 gfdl.1
 
 PLIST_SUB=	EMACS_VER=${PORTVERSION} EMACS_ARCH=${CONFIGURE_TARGET}
+
+post-patch:
+	@${RM} -f ${WRKSRC}/info/*
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/k5/share/src/cvs/emacs21/pkg-plist,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 pkg-plist
--- pkg-plist	22 Oct 2001 11:57:53 -0000	1.1.1.2
+++ pkg-plist	22 Oct 2001 12:00:30 -0000
@@ -36,117 +36,27 @@
 info/ada-mode
 info/autotype
 info/ccmode
-info/ccmode-1
-info/ccmode-2
-info/ccmode-3
-info/ccmode-4
 info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
 info/dired-x
 info/ebrowse
 info/ediff
-info/ediff-1
-info/ediff-2
-info/ediff-3
 info/efaq
-info/efaq-1
-info/efaq-2
-info/efaq-3
-info/efaq-4
-info/efaq-5
 info/emacs
-info/emacs-1
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
-info/emacs-2
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/emacs-25
-info/emacs-26
-info/emacs-27
-info/emacs-28
-info/emacs-29
-info/emacs-3
-info/emacs-30
-info/emacs-31
-info/emacs-32
-info/emacs-33
-info/emacs-34
-info/emacs-35
-info/emacs-36
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
 info/emacs-mime
 info/eshell
 info/eudc
 info/forms
 info/gnus
-info/gnus-1
-info/gnus-10
-info/gnus-11
-info/gnus-12
-info/gnus-13
-info/gnus-14
-info/gnus-15
-info/gnus-16
-info/gnus-17
-info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
-info/gnus-6
-info/gnus-7
-info/gnus-8
-info/gnus-9
 info/idlwave
 info/info
 info/message
 info/mh-e
-info/mh-e-1
-info/mh-e-2
-info/mh-e-3
-info/mh-e-4
 info/pcl-cvs
 info/reftex
-info/reftex-1
-info/reftex-2
-info/reftex-3
-info/reftex-4
-info/reftex-5
 info/sc
-info/sc-1
-info/sc-2
-info/sc-3
 info/speedbar
 info/vip
-info/vip-1
-info/vip-2
 info/viper
-info/viper-1
-info/viper-2
-info/viper-3
-info/viper-4
-info/viper-5
 info/widget
 info/woman
 @exec install-info %D/info/ada-mode %D/info/dir
@@ -2022,5 +1932,3 @@
 @dirrm share/emacs/%%EMACS_VER%%/lisp
 @dirrm share/emacs/%%EMACS_VER%%/site-lisp
 @dirrm share/emacs/%%EMACS_VER%%
-@dirrm share/emacs/site-lisp
-@dirrm share/emacs
Index: files/patch-configure.in
===================================================================
RCS file: /home/k5/share/src/cvs/emacs21/files/patch-configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure.in
--- files/patch-configure.in	22 Oct 2001 11:57:53 -0000	1.1.1.1
+++ files/patch-configure.in	22 Oct 2001 12:19:56 -0000
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Oct 22 18:59:42 2001
-+++ configure.in	Mon Oct 22 19:01:49 2001
+--- configure.in.orig	Fri Oct 19 23:09:18 2001
++++ configure.in	Mon Oct 22 21:19:32 2001
 @@ -179,6 +179,15 @@
  machine='' opsys='' unported=no
  case "${canonical}" in
@@ -24,3 +24,11 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
+@@ -2007,6 +2015,7 @@
+ # Solaris requires -lintl if you want strerror (which calls dgettext)
+ # to return localized messages.
+ AC_CHECK_LIB(intl, dgettext)
++AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
+ 
+ AC_MSG_CHECKING(whether localtime caches TZ)
+ AC_CACHE_VAL(emacs_cv_localtime_cache,
Index: files/patch-man:Makefile.in
===================================================================
RCS file: files/patch-man:Makefile.in
diff -N files/patch-man:Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-man:Makefile.in	22 Oct 2001 11:44:00 -0000
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Thu Apr 26 02:17:33 2001
++++ man/Makefile.in	Mon Oct 22 20:43:45 2001
+@@ -31,7 +31,7 @@
+ 
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+ 		../info/info ../info/message ../info/mh-e ../info/reftex \

--Multipart_Mon_Oct_22_21:44:46_2001-1--
