Date: Tue, 26 Sep 2000 11:08:47 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/21549: Update ports: XEmacs21-21.1.12 Message-ID: <200009260208.e8Q28lh77386@pis.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 21549 >Category: ports >Synopsis: Update ports: XEmacs21-21.1.12 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 25 19:10:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KIRIYAMA Kazuhiko >Release: FreeBSD 5.0-CURRENT i386 >Organization: Toba National College of Maritime Technology. Department of Electronic Mechanical Engineering >Environment: >Description: Updated the port XEmacs21-21.1.12. Current modifications are : (1) XIM support is enable in default. (2) Port name changes with respect to Wnn4 -> FreeWnn (3) Sevral bug fixed abount make execution Update files are respecively : [Add] : editors/xemacs21/patches/patch-aa [Delete] : editors/xemacs21/patches/patch-an I put the diff from ports-current in "Fix:". >How-To-Repeat: >Fix: diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/Makefile editors/xemacs21/Makefile --- /usr/ports/current/editors/xemacs21/Makefile Sun Sep 24 12:33:43 2000 +++ editors/xemacs21/Makefile Tue Sep 26 11:02:13 2000 @@ -24,18 +24,18 @@ XEMACS_REL= 21.1 XEMACS_VER= 21.1.12 +XEMACS_ARCH= ${CONFIGURE_TARGET} + DIST_SUBDIR= xemacs SLAVEDIRS+= editors/xemacs21-mule USE_XLIB= yes USE_XPM= yes -USE_GMAKE= yes STRIP= -HAS_CONFIGURE= yes -XEMACS_ARCH= ${MACHINE_ARCH}--freebsd +USE_AUTOCONF= yes +CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd -CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ - --with-clash-detection \ +CONFIGURE_ARGS?=--with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ --with-session=yes \ diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/patches/patch-aa editors/xemacs21/patches/patch-aa --- /usr/ports/current/editors/xemacs21/patches/patch-aa Thu Jan 1 09:00:00 1970 +++ editors/xemacs21/patches/patch-aa Thu Sep 21 22:33:37 2000 @@ -0,0 +1,11 @@ +--- lib-src/Makefile.in.in~ Tue Feb 8 11:54:39 2000 ++++ lib-src/Makefile.in.in Thu Sep 21 22:26:13 2000 +@@ -224,7 +224,7 @@ + (cd ${archlibdir} && \ + $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) + +-.PHONY: mostlyclean clean distclean realclean extraclean ++.PHONY: mostlyclean clean distclean realclean extraclean ${archlibdir} + mostlyclean: + $(RM) *.o *.i core + clean: mostlyclean diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/patches/patch-af editors/xemacs21/patches/patch-af --- /usr/ports/current/editors/xemacs21/patches/patch-af Thu Aug 10 12:32:59 2000 +++ editors/xemacs21/patches/patch-af Thu Sep 21 21:18:20 2000 @@ -1,19 +1,53 @@ ---- configure.orig Fri Aug 4 11:49:54 2000 -+++ configure Mon Aug 7 22:38:52 2000 -@@ -1042,6 +1042,7 @@ - +--- configure.in.orig Fri Aug 4 11:49:59 2000 ++++ configure.in Fri Sep 8 16:12:55 2000 +@@ -1053,6 +1053,7 @@ + dnl Straightforward OS determination case "$canonical" in *-*-linux* ) opsys=linux ;; + *-*-freebsd* ) opsys=freebsd ;; *-*-netbsd* ) opsys=netbsd ;; *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -11407,7 +11408,7 @@ +@@ -3052,21 +3053,24 @@ + test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) } + fi + dnl Back to our regularly scheduled wnn hunting +- if test -z "$with_wnn" -o "$with_wnn" = "yes"; then +- AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn, +- AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4, +- AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6, +- AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no)))) ++ if test "$with_wnn6" = "yes"; then ++ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6, ++ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc, ++ AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no]))) ++ else ++ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then ++ AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn, ++ AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4, ++ AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes], ++ AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no)))) ++ fi + fi + test -z "$with_wnn" && with_wnn=yes + if test "$with_wnn" = "yes"; then + AC_DEFINE(HAVE_WNN) + XE_PREPEND(-l$libwnn, libs_x) + XE_ADD_OBJS(mule-wnnfns.o) +- if test "$with_wnn6" != "no"; then +- AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes) +- test "$with_wnn6" = "yes" && AC_DEFINE(WNN6) +- fi ++ test "$with_wnn6" = "yes" && AC_DEFINE(WNN6) + fi + + dnl Autodetect canna +@@ -3579,7 +3583,7 @@ + dnl Check for Berkeley DB. if test "$with_database_berkdb" != "no"; then - echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 - echo "configure:11410: checking for Berkeley db.h" >&5 + AC_MSG_CHECKING(for Berkeley db.h) - for path in "db/db.h" "db.h"; do + for path in "/usr/include/db.h" "db/db.h" "db.h"; do - cat > conftest.$ac_ext <<EOF - #line 11413 "configure" - #include "confdefs.h" + AC_TRY_COMPILE([ + #include <stdlib.h> + #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21/patches/patch-an editors/xemacs21/patches/patch-an --- /usr/ports/current/editors/xemacs21/patches/patch-an Wed Jul 26 12:32:26 2000 +++ editors/xemacs21/patches/patch-an Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- lisp/package-get.el.orig Mon Jul 17 08:33:09 2000 -+++ lisp/package-get.el Tue Jul 25 19:23:32 2000 -@@ -848,7 +848,7 @@ - (message "Validating checksum for `%s'..." package) (sit-for 0) - (with-temp-buffer - (insert-file-contents-literally full-package-filename) -- (if (not (string= (md5 (current-buffer)) -+ (if (not (string= (md5 (current-buffer) (point-min) (point-max) 'no-conversion) - (package-get-info-prop this-package - 'md5sum))) - (error "Package %s does not match md5 checksum" base-filename))) diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21-mule/Makefile editors/xemacs21-mule/Makefile --- /usr/ports/current/editors/xemacs21-mule/Makefile Sun Sep 24 12:33:46 2000 +++ editors/xemacs21-mule/Makefile Tue Sep 26 11:02:13 2000 @@ -17,7 +17,7 @@ # WITH_INPUT_METHOD : input methods(configure arguments) # LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods # BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods -# WITH_XIM : X Input Method(configure arguments) +# WITH_XIM : X Input Method(configure arguments), xlib or motif .if !defined(MULE_SLAVE) && !defined(MULE_COMMON) MULE_SLAVE= yes @@ -36,9 +36,7 @@ intl.1:${PORTSDIR}/devel/gettext \ ${LIB_INPUT_METHOD} -CONFIGURE_ARGS?=${XEMACS_ARCH} \ - --prefix=${PREFIX} \ - --with-x11 \ +CONFIGURE_ARGS?=--with-x11 \ --with-xim=${WITH_XIM} \ --with-mule \ --x-includes=${X11BASE}/include \ @@ -57,7 +55,7 @@ --with-jpeg \ --with-png \ --with-tiff \ - --infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ + --infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-database=berkdb \ @@ -80,11 +78,11 @@ COMMENT_TEXT?= XEmacs(version ${XEMACS_MAJOR_VER}) text editor with mule(Only the executables) .if defined(MULE_SLAVE) BINNAMEEXT= -mule -SITE_INCLUDES+= ${PREFIX}/include -SITE_LIBRARIES+= ${PREFIX}/lib +SITE_INCLUDES+= ${LOCALBASE}/include +SITE_LIBRARIES+= ${LOCALBASE}/lib WITH_INPUT_METHOD?= --with-canna=no --with-wnn=no --with-wnn6=no .endif -WITH_XIM?= no +WITH_XIM?= xlib .if defined(MULE_SLAVE) pre-build: diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21-mule-common/Makefile editors/xemacs21-mule-common/Makefile --- /usr/ports/current/editors/xemacs21-mule-common/Makefile Fri Sep 8 20:32:19 2000 +++ editors/xemacs21-mule-common/Makefile Tue Sep 26 11:02:13 2000 @@ -18,7 +18,7 @@ # WITH_INPUT_METHOD : input methods(configure arguments) # LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods # BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods -# WITH_XIM : X Input Method(configure arguments) +# WITH_XIM : X Input Method(configure arguments), xlib or motif XEMACS_MAJOR_VER= 21 diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/editors/xemacs21-mule-common/pkg/PLIST editors/xemacs21-mule-common/pkg/PLIST --- /usr/ports/current/editors/xemacs21-mule-common/pkg/PLIST Sat Aug 26 04:32:31 2000 +++ editors/xemacs21-mule-common/pkg/PLIST Sun Sep 24 22:53:06 2000 @@ -395,6 +395,7 @@ lib/xemacs-%%XEMACS_VER%%/info/cl.info-5 lib/xemacs-%%XEMACS_VER%%/info/cl.info-6 lib/xemacs-%%XEMACS_VER%%/info/custom.info +lib/xemacs-%%XEMACS_VER%%/info/dir lib/xemacs-%%XEMACS_VER%%/info/external-widget.info lib/xemacs-%%XEMACS_VER%%/info/info.info lib/xemacs-%%XEMACS_VER%%/info/internals.info diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/japanese/xemacs21-canna/Makefile japanese/xemacs21-canna/Makefile --- /usr/ports/current/japanese/xemacs21-canna/Makefile Fri Sep 8 20:34:30 2000 +++ japanese/xemacs21-canna/Makefile Tue Sep 26 11:02:13 2000 @@ -18,7 +18,7 @@ # WITH_INPUT_METHOD : input methods(configure arguments) # LIB_INPUT_METHOD : LIB_DEPENDS list of Input Methods # BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods -# WITH_XIM : X Input Method(configure arguments) +# WITH_XIM : X Input Method(configure arguments), xlib or motif CATEGORIES= japanese @@ -31,27 +31,27 @@ DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl .if defined(CANNA) && defined(FREEWNN) PKGNAMESUFFIX= -canna+freewnn -SITE_INCLUDES= ${LOCALBASE}/include/wnn WITH_INPUT_METHOD= --with-canna --with-wnn --with-wnn6=no LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna \ wnn.0:${PORTSDIR}/japanese/FreeWnn-lib COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and FreeWnn support .elif defined(CANNA) && defined(WNN6) PKGNAMESUFFIX= -canna+wnn6 +SITE_INCLUDES= ${LOCALBASE}/include/wnn6 WITH_INPUT_METHOD= --with-canna --with-wnn6 -LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna -BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib +LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna \ + wnn6.1:${PORTSDIR}/japanese/Wnn6-lib COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support .elif defined(FREEWNN) PKGNAMESUFFIX= -freewnn -SITE_INCLUDES= ${LOCALBASE}/include/wnn WITH_INPUT_METHOD= --with-wnn --with-canna=no --with-wnn6=no LIB_INPUT_METHOD= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and FreeWnn support .elif defined(WNN6) PKGNAMESUFFIX= -wnn6 +SITE_INCLUDES= ${LOCALBASE}/include/wnn6 WITH_INPUT_METHOD= --with-wnn6 --with-canna=no -BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib +LIB_INPUT_METHOD= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support .else PKGNAMESUFFIX= -canna @@ -59,9 +59,6 @@ LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Canna support .endif - -# If you need XIM support, set this to "xlib" or "motif". -WITH_XIM?= no post-install:: @${MKDIR} ${PREFIX}/man/ja/man1 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009260208.e8Q28lh77386>