1 files changed, 80 insertions, 47 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 595b5239e4fd..978ec976705a 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,21 +7,28 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
 CATEGORIES+=	editors
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
-		${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
+.if defined(CANNA) && defined(FREEWNN)
+PKGNAMESUFFIX+=	-canna+freewnn
+.elif defined(CANNA) && defined(WNN6)
+PKGNAMESUFFIX+=	-canna+wnn6
+.elif defined(FREEWNN)
+PKGNAMESUFFIX+=	-freewnn
+.elif defined(WNN6)
+PKGNAMESUFFIX+= -wnn6
+.elif defined(CANNA)
+PKGNAMESUFFIX+=	-canna
+.endif
 DISTNAME=	xemacs-${XEMACS_VER:S/-b/./}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anrays@gmail.com
 COMMENT?=	XEmacs(beta version) text editor with mule(Only the executables)
 
-.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
+BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${PORTSDIR}/editors/xemacs-mule-packages
 .if defined(PKGNAMEPREFIX)
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-devel-mule
 .endif
@@ -30,16 +37,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
+
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 .endif
-LIB_DEPENDS+=	${LIB_INPUT_METHOD}
 
-XEMACS_MAJOR_VER?=	21
-XEMACS_REL=		${XEMACS_MAJOR_VER}.5
-XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b16
-XEMACS_ARCH=		${CONFIGURE_TARGET}
+XEMACS_REL=	21.5
+XEMACS_VER=	${XEMACS_REL}-b19
+XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
@@ -59,11 +65,9 @@ CONFIGURE_ARGS=	--with-mule \
 		--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 \
 		--with-database=berkdb \
-		${WITH_XPM} ${WITH_XIM} \
-		${WITH_ATHENA} \
-		${WITH_MENUBARS} ${WITH_SCROLLBARS} ${WITH_DIALOGS} ${WITH_WIDGETS} \
-		${WITH_OFFIX} ${WITH_GTK} \
-		${WITH_INPUT_METHOD}
+		${WITH_XIM} \
+		${WITH_MENUBARS} ${WITH_SCROLLBARS} \
+		${WITH_DIALOGS} ${WITH_WIDGETS}
 MAKE_ARGS=	prefix=${PREFIX}
 ALL_TARGET=	all dist
 .if defined(PKGNAMEPREFIX)
@@ -76,13 +80,25 @@ DESCR=		${PKGDIR}/pkg-descr.ja
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 .endif
+
+.if !defined(DEBUG)
+CONFIGURE_ARGS+=--debug=no --error-checking=none
+.endif
+
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=--with-gtk
+USE_GNOME+=	gtk12
+.endif
+
 PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+.include <bsd.port.pre.mk>
+
 # Undump and malloc do not behave on amd64 at the moment
 .if ${ARCH} == "amd64"
-CONFIGURE_ARGS+= --with-system-malloc --pdump 
+CONFIGURE_ARGS+=--with-system-malloc --pdump
 .endif
 
 pre-fetch:
@@ -92,6 +108,9 @@ pre-fetch:
 	@${ECHO_MSG} "do not want to use X11."
 CONFIGURE_ARGS+=	--without-x11
 .else
+.if !defined(WITH_GTK)
+	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WITH_GTK and recompile."
+.endif
 .if !defined(WITHOUT_MOTIF)
 .if !defined(MOTIF_STATIC)
 	@${ECHO_MSG} ""
@@ -100,7 +119,7 @@ CONFIGURE_ARGS+=	--without-x11
 	@${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
-CONFIG_ARGS+=	--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes
+CONFIGURE_ARGS+=--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes
 USE_MOTIF=	yes
 
 # hack to avoid shipping binaries linked with Motif
@@ -111,72 +130,86 @@ WITH_DIALOGS=	--with-dialogs=motif
 .endif
 
 .if defined(PACKAGE_BUILDING)
-WITH_OFFIX?=	--with-offix=no
+CONFIGURE_ARGS+=--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
-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
+
+.if defined(WITH_XAW3D)
+CONFIGURE_ARGS+=--with-athena=3d
+.else
+CONFIGURE_ARGS+=--with-athena=xaw
+.endif
+
+.endif
+
+.if exists(${LOCALBASE}/include/libpq-fe.h)
+WITH_PGSQL=	yes
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+PLIST_SUB+=	WITH_PGSQL=""
+.else
+PLIST_SUB+=	WITH_PGSQL="@comment "
 .endif
 
 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 \
+CONFIGURE_ARGS+=	--with-canna --with-wnn --with-wnn6=no
+LIB_DEPENDS+=		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 \
+CONFIGURE_ARGS+=	--with-canna --with-wnn6
+LIB_DEPENDS+=		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
+CONFIGURE_ARGS+=	--with-wnn --with-canna=no --with-wnn6=no
+LIB_DEPENDS+=		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
+CONFIGURE_ARGS+=	--with-wnn6 --with-canna=no
+LIB_DEPENDS+=		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
+CONFIGURE_ARGS+=	--with-canna --with-wnn=no --with-wnn6=no
+LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
+.else
+CONFIGURE_ARGS+=	--with-canna=no --with-wnn=no --with-wnn6=no
 .endif
 SITE_INCLUDES+=		${LOCALBASE}/include
 SITE_LIBRARIES+=	${LOCALBASE}/lib
-WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
 
 # fix .so references in a few man pages
-pre-configure::
+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 -exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
 
-post-install::
-.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
-	${STRIP_CMD} ${PREFIX}/bin/${file}
+post-install:
+.if !defined(DEBUG)
+.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
+	${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
+.endif
 # 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
+	${FIND} ${PREFIX}/lib/xemacs-${XEMACS_VER} -name \*~ \
+		-exec ${RM} -f \{} \;
 	${RM} -f ${PREFIX}/bin/send-pr
 .if defined(PKGNAMEPREFIX)
 .if ${PKGNAMEPREFIX} == "ja-"