From ded1d8f809a509b5a066f2e6b9ca5f16dfa5cb1f Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 6 Jul 2003 18:34:48 +0000
Subject: [PATCH] Remove compface flavor with its licensing complications. No
 response from maintainer.

---
 editors/xemacs21/Makefile  | 39 +++++++-------------------------------
 editors/xemacs21/pkg/DESCR |  2 --
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 5bfb50a23f9..b4650a86aba 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/04/24 18:21:26 lebel Exp $
+# $OpenBSD: Makefile,v 1.20 2003/07/06 18:34:48 naddy Exp $
 
 COMMENT=		"heavily customizable and extensible editor"
 
@@ -11,9 +11,10 @@ HOMEPAGE=		http://www.xemacs.org/
 # where to send bitches about this port
 MAINTAINER=		Jean-Yves Burlett <jean-yves@burlett.org>
 
-# GNU GPL License
-# PERMIT_PACKAGE_CDROM=	??? # depends on flavors (compface), see below
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 # where the source files and patches can be fetched
@@ -65,6 +66,7 @@ CONFIGURE_ARGS+=	--infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
 			--with-msw=no \
 			--without-tooltalk \
 			--with-sound=no \
+			--with-xface=no \
 			--without-wnn6 \
 			--without-gtk \
 			--without-gnome \
@@ -72,7 +74,7 @@ CONFIGURE_ARGS+=	--infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
 			--with-file-coding=yes \
 			--with-system-malloc \
 			--pdump
-			
+
 # there is not (yet) bsd sound support in XEmacs
 # XEmacs does not work with OpenLDAP (linking problem, 
 # will try to fix if somebody asks)
@@ -96,7 +98,7 @@ SUBST_VARS=	GCCARCH
 FLAVORS=	mule canna wnn
 
 # X11 Related
-FLAVORS+=	no_x11 compface
+FLAVORS+=	no_x11
 
 FLAVOR?=
 
@@ -108,10 +110,6 @@ FLAVOR?=
 
 CONFIGURE_ARGS+=--without-x11
 
-. if ${FLAVOR:L:Mcompface}
-ERRORS+= "Fatal: You cannot use X11-related flavors with a non-X11 flavor"
-. endif
-
 .else
 
 ### X11-dependent flavors
@@ -132,17 +130,6 @@ CONFIGURE_ARGS+=--with-png \
 LIB_DEPENDS+=	tiff.35::graphics/tiff
 CONFIGURE_ARGS+=--with-tiff
 
-. if ${FLAVOR:L:Mcompface}
-
-# compface statically linked -> license issues
-PERMIT_PACKAGE_CDROM=   "No Fee"
-PERMIT_DISTFILES_CDROM=	"No Fee"
-BUILD_DEPENDS+=  ::graphics/compface
-CONFIGURE_ARGS+=--with-xface
-. else
-CONFIGURE_ARGS+=--with-xface=no
-. endif
-
 . if ${FLAVOR:L:Mmule}
 CONFIGURE_ARGS+=	--with-xim=xlib
 # prevents XEmacs from using motif's XIM which coredumps a lot
@@ -184,18 +171,6 @@ CONFIGURE_ARGS+=--with-mule=no \
 		--with-wnn=no
 .endif
 
-#
-# license-related
-#
-
-.if !defined(PERMIT_PACKAGE_CDROM)
-PERMIT_PACKAGE_CDROM=	Yes
-.endif
-
-.if !defined(PERMIT_DISTFILES_CDROM)
-PERMIT_DISTFILES_CDROM=	Yes
-.endif
-
 #######
 STRIP_EXECS=    cvtmail digest-doc fakemail gnuserv hexl make-docfile \
 		mmencode movemail profile sorted-doc wakeup yow
diff --git a/editors/xemacs21/pkg/DESCR b/editors/xemacs21/pkg/DESCR
index c282bcd6c4b..ca0baab6293 100644
--- a/editors/xemacs21/pkg/DESCR
+++ b/editors/xemacs21/pkg/DESCR
@@ -18,8 +18,6 @@ Flavors:
 	mule 		- MUlti-Lingual Emacs
 	wnn 		- input method (needs mule) [1]
 	canna 		- another input method (needs mule) [1]
-	compface	- support for XFaces (needs X11),
-			  useful only for Gnus users.
 	no_x11		- disable X11 support
 
 [1] XEmacs coredumps if the {canna,wnn} server is killed before it closes