mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Enable XIM support by default.

Browse Source 
Reflect Wnn4 -> FreeWnn change.
Fix build problems.

PR:		ports/21549
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
This commit is contained in:
Akinori MUSHA 2000-10-24 10:53:40 +00:00
parent 426c50095e
commit 5d0b889000
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=34176
13 changed files with 194 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/xemacs-devel/Makefile
View File

@ -24,18 +24,18 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
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 \

11
editors/xemacs-devel/files/patch-aa Normal file
View File

@ -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

54
editors/xemacs-devel/files/patch-af
View File

@ -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)

10
editors/xemacs/Makefile
View File

@ -24,18 +24,18 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
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 \

11
editors/xemacs/files/patch-aa Normal file
View File

@ -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

54
editors/xemacs/files/patch-af
View File

@ -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)

2
editors/xemacs21-mule-common/Makefile
View File

@ -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

1
editors/xemacs21-mule-common/pkg-plist
View File

@ -395,6 +395,7 @@ lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
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

14
editors/xemacs21-mule/Makefile
View File

@ -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 @@ LIB_DEPENDS= compface.1:${PORTSDIR}/mail/faces \
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 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} \
--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 @@ DESCR_TMPL?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
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:

10
editors/xemacs21/Makefile
View File

@ -24,18 +24,18 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
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 \

11
editors/xemacs21/files/patch-aa Normal file
View File

@ -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

54
editors/xemacs21/files/patch-af
View File

@ -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)

15
japanese/xemacs21-canna/Makefile
View File

@ -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 @@ XEMACS_MAJOR_VER?= 21
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
@ -60,9 +60,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
@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1