Modify files for move xemacs21-mule to version 21.4.12.

svn path=/head/; revision=80515

editors/xemacs21-mule/Makefile

@@ -5,156 +5,194 @@
 # $FreeBSD$
 #
 
-# This is the MASTER port of XEmacs Mule slave ports(japanese/xemacs${XEMACS_MAJOR_VER}-*)
-# and provides `Architecture Dependent' parts of xemacs binary.
-#
-# Caracteristic variables of XEmacs Mule ports family:
-#	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
-#	MULE_COMMON       : COMMON port if defined
-#	MULE_SLAVE        : SLAVE port if defined
-#	SITE_INCLUDES     : site include path(configure arguments)
-#	SITE_LIBRARIES    : site libraries path(configure arguments)
-#	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), xlib or motif
-
-.if !defined(MULE_SLAVE) && !defined(MULE_COMMON)
-MULE_SLAVE=	yes
+PORTNAME=	xemacs-mule
+PORTVERSION=	${XEMACS_VER}
+.if defined(WNN6)
 .endif
+CATEGORIES+=	editors
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
+DISTNAME=	xemacs-${XEMACS_VER}
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
+		${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
+DIST_SUBDIR=	xemacs
 
-MAINTAINER?=	kiri@FreeBSD.org
-COMMENT?=	XEmacs(version 21) text editor with mule(Only the executables)
+MAINTAINER=	kiri@FreeBSD.org
+COMMENT?=	XEmacs(gamma version) text editor with mule(Only the executables)
 
-BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
-.if defined(MULE_SLAVE)
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule-common \
+.include <bsd.port.pre.mk>
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages \
 		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
-.else
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+.if defined(PKGNAMEPREFIX)
+RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs21-mule
 .endif
-LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		compface.1:${PORTSDIR}/mail/faces \
 		intl.4:${PORTSDIR}/devel/gettext \
 		${LIB_INPUT_METHOD}
 
-CONFIGURE_ARGS?=--with-x11 \
-		--with-xim=${WITH_XIM} \
+XEMACS_MAJOR_VER?=	21
+XEMACS_REL=		${XEMACS_MAJOR_VER}.4
+XEMACS_VER=		${XEMACS_MAJOR_VER}.4.12
+XEMACS_ARCH=		${CONFIGURE_TARGET}
+
+USE_XLIB=	yes
+STRIP=
+USE_AUTOCONF=	yes
+CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
+
+CONFIGURE_ARGS=	--with-x11 \
 		--with-mule \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--site-libraries='${SITE_LIBRARIES}' \
 		--site-includes='${SITE_INCLUDES}' \
-		--gung-ho=yes \
 		--with-xface \
-		--with-xpm \
 		--with-sound=native \
 		--with-site-lisp \
 		--with-pop \
 		--with-xfs \
-		--with-menubars=lucid \
-		--with-scrollbars=lucid \
-		--with-dialogs=athena \
 		--with-jpeg \
 		--with-png \
 		--with-tiff \
+		--with-ldap=no \
 		--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 \
+		${WITH_XPM} ${WITH_XIM} \
+		${WITH_ATHENA} \
+		${WITH_MENUBARS} ${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
+		${WITH_OFFIX} ${WITH_GTK} \
 		${WITH_INPUT_METHOD}
-MAKE_ENV=	LANG=C
-INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
-PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
-STRIP=
-INSTALL_TARGET?=install-arch-dep
-FILESDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
-PATCHDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
-PKGDIR?=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule
+MAKE_ARGS=	prefix=${PREFIX}
+ALL_TARGET=	all dist
+.if defined(PKGNAMEPREFIX)
+INSTALL_TARGET=	install-arch-dep
+PLIST=		${PKGDIR}/pkg-plist.arch-dep
+.if ${PKGNAMEPREFIX} == "ja-"
+DESCR=		${PKGDIR}/pkg-descr.ja
+MANLANG=	ja
+MAN1=		xemacs.1
+.endif
+.else
+MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
+		gnuserv.1 xemacs.1
+.endif
+PKGDIR=		${.CURDIR}/../../editors/xemacs21-mule
 
-SLAVEDIRS=	editors/xemacs21-mule-common editors/xemacs21-mule-sumo
+PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
+
+pre-fetch:
+.if !defined(WANT_GTK)
+	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK and recompile."
+.endif
+.if !defined(WITHOUT_MOTIF)
+.if !defined(MOTIF_STATIC)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might occasionally"
+	@${ECHO_MSG} "experience locked-up frames."
+	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, "
+	@${ECHO_MSG} "which will force the use of athena widgets for dialogs."
+.endif
+USE_MOTIF=	yes
+
+# hack to avoid shipping binaries linked with Motif
+.if defined(MOTIF_STATIC)
+WITH_DIALOGS=	--with-dialogs=athena
+.else
+WITH_DIALOGS=	--with-dialogs=motif
+.endif
+
+.if defined(WANT_GTK)
+WITH_GTK=	--with-gtk=yes
+WITH_XPM=	--with-xpm=no
+USE_GNOME=	gtk12
+USE_XPM=	no
+.endif
+
+.if defined(PACKAGE_BUILDING)
+WITH_OFFIX?=	--with-offix=no
+.endif
+WITH_ATHENA?=	--with-athena=xaw
+WITH_MENUBARS?=	--with-menubars=lucid
+WITH_SCROLLBARS?=--with-scrollbars=motif
+WITH_WIDGETS?=	--with-widgets=motif
+.endif
+USE_XPM?=	yes
+WITH_XPM?=	--with-xpm
+WITH_XIM?=	--with-xim=xlib
+WITH_ATHENA?=	--with-athena=xaw
+WITH_MENUBARS?=	--with-menubars=athena
+WITH_SCROLLBARS?=--with-scrollbars=athena
+WITH_DIALOGS?=	--with-dialogs=athena
+WITH_WIDGETS?=	--with-widgets=athena
 
-XEMACS_MAJOR_VER?=	21
-MULE_PORT=		yes
-PKGNAMESUFFIX?=		-mule
-DESCR_TMPL?=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
-.if defined(MULE_SLAVE)
 BINNAMEEXT=		-mule
+.if defined(CANNA) && defined(FREEWNN)
+PKGNAMESUFFIX=		-canna+freewnn
+WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
+			wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+.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 \
+			wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
+.elif defined(FREEWNN)
+PKGNAMESUFFIX=		-freewnn
+WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
+LIB_INPUT_METHOD=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+.elif defined(WNN6)
+PKGNAMESUFFIX=		-wnn6
+SITE_INCLUDES=		${LOCALBASE}/include/wnn6
+WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
+LIB_INPUT_METHOD=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
+.elif defined(CANNA)
+PKGNAMESUFFIX=		-canna
+WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
+LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
+.endif
 SITE_INCLUDES+=		${LOCALBASE}/include
 SITE_LIBRARIES+=	${LOCALBASE}/lib
 WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
-.endif
-WITH_XIM?=		xlib
 
-.if defined(MULE_SLAVE)
+# fix .so references in a few man pages
+pre-configure::
+.for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
+	@${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${file} > ${WRKDIR}/tmp_zot
+	@${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${file}
+.endfor
+
 pre-build:
-	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
 
-# for xemacs${XEMACS_MAJOR_VER}-mule-common in defining ${WRKDIRPREFIX}
-.if !exists(${WRKDIRPREFIX}${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-common)
-post-build:
-	@${MKDIR} ${WRKDIRPREFIX}${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-common
-.endif
-
 post-install::
+.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
+	strip ${PREFIX}/bin/${file}
+.endfor
+# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
+# Do what PLIST does for pkg_add.
+	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
+	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
+	${RM} -f ${PREFIX}/bin/send-pr
+.if defined(WANT_GTK)
+	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
+	@${ECHO_MSG} "the maintainer."
+	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
+	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
+.endif
+.if defined(PKGNAMEPREFIX)
+.if ${PKGNAMEPREFIX} == "ja-"
+	@${MKDIR} ${PREFIX}/man/ja/man1
+	@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1/xemacs.1
 	@${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
-	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+.endif
 .endif
 
-post-package:
-	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
-
-## for make DESCR (only maintainer use)
-#pre-arrange::
-#	@${MKDIR} ${PKGDIR}
-#.if (${PKGNAMESUFFIX} == "-canna") || (${PKGNAMESUFFIX} == "-mule") || (${PKGNAMESUFFIX} == "-mule-common")
-#	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
-#		-e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
-#		-e "s/%%XEMACS_MAJOR_VER%%/${XEMACS_MAJOR_VER}/g" \
-#		${DESCR_TMPL} > ${DESCR}
-#.endif
-#	${CHOWN} kiri:staff ${COMMENT} ${DESCR}
-#
-## for make PLIST (only maintainer use)
-#arrange::
-#.if (${PKGNAMESUFFIX} == "-mule")
-#	${RM} -f ${WRKPLIST}
-#	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
-#	${MAKE} build
-#	${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
-#		DIRRMDEPTH=2 plist
-#	${RM} -f ${PLIST}.org
-#.endif
-#.if ${PKGNAMESUFFIX} == "-mule-common"
-#	${RM} -f ${WRKPLIST}.tmp
-#	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
-#	${TOUCH} ${PLIST}
-#	${MAKE} build
-#	${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER}" PLIST_EXCLS="etc/rc.d" \
-#		DIRRMDEPTH=1 plist
-#.for dirp in site mule xemacs
-#.for dir in etc info man pkginfo
-#	${ECHO_CMD} "@exec mkdir -p %D/lib/xemacs/${dirp}-packages/${dir}" >> ${WRKPLIST}.tmp
-#	${ECHO_CMD} "@unexec rmdir %D/lib/xemacs/${dirp}-packages/${dir} 2>/dev/null || true" >> ${WRKPLIST}.tmp
-#.endfor
-#	${ECHO_CMD} "@unexec rmdir %D/lib/xemacs/${dirp}-packages 2>/dev/null || true" >> ${WRKPLIST}.tmp
-#.endfor
-#	${ECHO_CMD} "@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock" >> ${WRKPLIST}.tmp
-#	${CAT} ${WRKPLIST} >> ${WRKPLIST}.tmp
-#	${MV} ${WRKPLIST}.tmp ${WRKPLIST}
-#	${CHOWN} kiri:staff ${WRKPLIST}
-#	if [ ! -s ${PLIST} ]; then \
-#		${MV} ${WRKPLIST} ${PLIST}; \
-#	fi
-#	${RM} -f ${PLIST}.org
-#.endif
-
-.if ${PKGNAMESUFFIX} != "-mule-common"
-pre-plist:
-	@${ECHO} "===> pre-plist of ${PKGNAME}"
-	${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja
-.endif
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}
-
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.post.mk>

editors/xemacs21-mule/pkg-descr

@@ -1,17 +1,14 @@
-This is a package containing only the executables for XEmacs with
-Mule(version 21.1.14), the next generation of Emacs.
-
-You need to install a package, xemacs-common-21.1.14, containing emacs
-lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.14).
+This is a package containing only the executables for development
+version(gamma) of XEmacs with Mule(version 21.4.12), the next
+generation of Emacs.
 
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
 input method, look into the xemacs ports in language- specific directories.
 Currently only Japanese (Canna, FreeWnn and Wnn6) is available.
 
-This package and the package, xemacs-common-21.1.14 are designed
-*not* to clobber any existing emacs installation.  In particular, the
-executables and man pages of etags/ctags are not installed, and the
-info pages that come with the original emacs don't get installed too.
-The Japanese version is build to install everything, by the way.
+This package is designed *not* to clobber any existing emacs installation.
+In particular, the executables and man pages of etags/ctags are not
+installed, and the info pages that come with the original emacs don't get
+installed too. The Japanese version is build to install everything, by the
+way.