1 files changed, 47 insertions, 52 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 496ab7f6b9d2..b47f0d01ddbb 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -6,90 +6,85 @@
 #
 
 PORTNAME=	emacs
-PORTVERSION=	21.3
-PORTREVISION=	10
+PORTVERSION=	${EMACS_VER}
 CATEGORIES=	editors ipv6
-MASTER_SITES=		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nobutaka@FreeBSD.org
+MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
 
-CONFLICTS=	emacs-19.* emacs-22.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-
 .if !defined(WITHOUT_X11)
-LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+.if defined(WITHOUT_GTK)
+LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+.endif
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png
-USE_XLIB=	yes
-USE_XPM=	yes
 .endif
 
-.if defined(WITH_MENUBAR_FONTSET)
-PATCH_SITES=		http://nijino.homelinux.net/emacs/
-PATCHFILES=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-PATCH_DIST_STRIP=	-p1
-.endif
+CONFLICTS=	emacs-19.* emacs-21.* \
+		xemacs-[0-9]* xemacs-devel-[0-9]* \
+		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-USE_AUTOTOOLS=	autoconf:213
+EMACS_VER=	22.1
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+.if !defined(WITHOUT_X11)
+.if !defined(WITHOUT_GTK)
+USE_GNOME=	gtk20
+.else
+USE_XLIB=	yes
+.endif
+USE_XPM=	yes
+.endif
+
+CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
+.else
+.if !defined(WITHOUT_GTK)
+CONFIGURE_ARGS=		--with-gtk
 .endif
+.endif
+
 .if defined(WITHOUT_XIM)
 CONFIGURE_ARGS+=	--without-xim
 .endif
 
-MAN1=		ctags.1 emacs.1 etags.1 gfdl.1
-PLIST_SUB=	EMACS_VER=${PORTVERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-TEXIFILES=	ada-mode autotype cc-mode cl dired-x ebrowse ediff \
-		faq emacs emacs-mime eshell eudc forms gnus idlwave \
-		info message mh-e pcl-cvs reftex sc speedbar vip \
-		viper widget woman
-INFO=		ada-mode autotype ccmode cl dired-x ebrowse ediff \
-		efaq emacs emacs-mime eshell eudc forms gnus idlwave \
-		info message mh-e pcl-cvs reftex sc speedbar vip \
-		viper widget woman 
+CONFIGURE_ARGS+=	--infodir='$${prefix}/info' --mandir='$${prefix}/man'
+
+MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
+PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
+
+MAKE_ENV=	LC_ALL=C
+
+INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
+		efaq eintr elisp emacs-mime emacs erc eshell eudc \
+		flymake forms gnus idlwave info message mh-e newsticker \
+		org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
+		tramp url vip viper widget woman
 
 LATEST_LINK=	emacs
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
+BROKEN=	Emacs 22.X does not currently build on ia64
 .endif
 
 pre-everything::
-.if !defined(WITH_MENUBAR_FONTSET)
+.if !defined(WITHOUT_X11) && !defined(WITHOUT_GTK)
 	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To enable menubar fontset support, define WITH_MENUBAR_FONTSET"
+	@${ECHO_MSG} "====> To disable GTK+ interface support, define WITHOUT_X11 or WITHOUT_GTK"
+	@${ECHO_MSG} "====>"
+.endif
+.if !defined(WITHOUT_X11) && !defined(WITHOUT_XIM)
+	@${ECHO_MSG} "====>"
+	@${ECHO_MSG} "====> To disable X11 Input Method support, define WITHOUT_XIM"
 	@${ECHO_MSG} "====>"
 .endif
-
-post-patch:
-	@${RM} -f ${WRKSRC}/info/*
-	@(cd ${WRKSRC}/man ; \
-	for f in ${TEXIFILES} ; do \
-	${CP} $${f}.texi $${f}.texi.orig ; \
-	${SED} -e "s/@dircategory Emacs/@dircategory The Emacs editor and associated tools/" < $${f}.texi.orig > $${f}.texi ; \
-	${RM} $${f}.texi.orig ; \
-	done)
-
-post-build:
-	(cd ${WRKSRC}/lisp ; \
-	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
-	 ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${PORTVERSION}.1 ; \
-	 cd ${WRKSRC}/src ; \
-	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>