From 29b3a8b047f94b6c723e54d332eeed84e50a23a9 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Wed, 16 Aug 2000 16:34:17 +0000
Subject: [PATCH] - add no_x11 flavor - move the example config file to
 ${PREFIX}/share/examples/ ok espie@

---
 net/ytalk/Makefile      | 14 ++++++++++----
 net/ytalk/pkg/DEINSTALL |  4 ++--
 net/ytalk/pkg/INSTALL   |  9 +++++----
 net/ytalk/pkg/PLIST     |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 3bd4f1d133d..dfa2db848d9 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2000/06/12 16:54:20 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/08/16 16:34:17 naddy Exp $
 
 DISTNAME=	ytalk-3.1.1
 CATEGORIES=	net
-NEED_VERSION=	1.299
+NEED_VERSION=	1.319
 HOMEPAGE=	http://www.iagora.com/~espel/ytalk/
 MASTER_SITES=	${HOMEPAGE} \
 		ftp://quatramaran.ens.fr/pub/orabidoo/ytalk/
@@ -14,14 +14,20 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FLAVORS= no_x11
+FLAVOR?=
+
 # No gnu-configure for now, need to set up DESTDIR in prefix/etc for fake
 # to work.
 CONFIGURE_STYLE=gnu dest
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+= --without-x
+.endif
+SUBST_VARS=	SYSCONFDIR
 
 INSTALL_TARGET=	install.bin install.man
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/ytalk
-	${INSTALL_DATA} ${WRKBUILD}/ytalkrc ${PREFIX}/lib/ytalk/ytalkrc.sample
+	${INSTALL_DATA} ${WRKBUILD}/ytalkrc ${PREFIX}/share/examples/ytalkrc
 
 .include <bsd.port.mk>
diff --git a/net/ytalk/pkg/DEINSTALL b/net/ytalk/pkg/DEINSTALL
index be924b45ab6..160a1c09630 100644
--- a/net/ytalk/pkg/DEINSTALL
+++ b/net/ytalk/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2000/07/19 09:31:22 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2000/08/16 16:34:19 naddy Exp $
 #
 # ytalk de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/ytalkrc
+CONFIG_FILE=${SYSCONFDIR}/ytalkrc
 
 if [ -f ${CONFIG_FILE} ]; then
     echo
diff --git a/net/ytalk/pkg/INSTALL b/net/ytalk/pkg/INSTALL
index 41a722b3995..809ddd620b8 100644
--- a/net/ytalk/pkg/INSTALL
+++ b/net/ytalk/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2000/03/25 06:51:47 brad Exp $
+# $OpenBSD: INSTALL,v 1.3 2000/08/16 16:34:19 naddy Exp $
 #
 # Pre/post-installation setup of ytalk
 
@@ -8,7 +8,8 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/ytalkrc
+CONFIG_FILE=${SYSCONFDIR}/ytalkrc
+SAMPLE_CONFIG_FILE=$PREFIX/share/examples/ytalkrc
 
 # Function: tell the user what s/he needs to do to use the port just installed
 #
@@ -18,7 +19,7 @@ do_notice()
     echo "+---------------"
     echo "| The existing $1 configuration file, ${CONFIG_FILE},"
     echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample file, ${PREFIX}/lib/ytalk/ytalkrc.sample,"
+    echo "| current sample file, ${SAMPLE_CONFIG_FILE},"
     echo "| and update your configuration as needed."
     echo "+---------------"
     echo
@@ -28,7 +29,7 @@ do_notice()
 #
 do_install()
 {
-    install -o root -g wheel -m 644 ${PREFIX}/lib/ytalk/ytalkrc.sample ${CONFIG_FILE}
+    install -o root -g wheel -m 644 ${SAMPLE_CONFIG_FILE} ${CONFIG_FILE}
     echo
     echo "+---------------"
     echo "| The $1 configuration file, ${CONFIG_FILE},"
diff --git a/net/ytalk/pkg/PLIST b/net/ytalk/pkg/PLIST
index bd175ea5c43..23478cb3771 100644
--- a/net/ytalk/pkg/PLIST
+++ b/net/ytalk/pkg/PLIST
@@ -1,4 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.5 2000/08/16 16:34:19 naddy Exp $
 bin/ytalk
 man/man1/ytalk.1
-lib/ytalk/ytalkrc.sample
-@dirrm lib/ytalk
+share/examples/ytalkrc