Respect ${CONFDIR} and use the common INSTALL/DEINSTALL scripts instead of

the custom ones.  Also fix the directory handling during post-installation
and strongly buildlinkify.

10 files changed, 155 insertions, 168 deletions

diff --git a/chat/gale/DEINSTALL b/chat/gale/DEINSTALL
deleted file mode 100644
index 6f8ad485259..00000000000
--- a/chat/gale/DEINSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2001/11/19 04:58:59 lukem Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-USER="@GALE_USER@"
-GROUP="@GALE_GROUP@"
-
-CAT="@CAT@"
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-
-POST-DEINSTALL)
-	${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-
-  * the \`${USER}' user
-  * the \`${GROUP}' group
-  * the \`${PKG_PREFIX}/etc/gale' directory
-
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/chat/gale/INSTALL b/chat/gale/INSTALL
deleted file mode 100644
index b3ddb6eb715..00000000000
--- a/chat/gale/INSTALL
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/11/19 04:58:59 lukem Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-USER=@GALE_USER@
-GROUP=@GALE_GROUP@
-
-ADDUSER="@ADDUSER@"
-ADDGROUP="@ADDGROUP@"
-CHGRP="@CHGRP@"
-ID="@ID@"
-RM="@RM@"
-TOUCH="@TOUCH@"
-
-case ${STAGE} in
-PRE-INSTALL)
-	# Group... the default's shipped with NetBSD
-	# We need to check that ${GROUP} exists before adding the user.
-	# Do it with chgrp to be able to use NIS.
-	#
-	${TOUCH} "/tmp/grouptest.$$"
-	${CHGRP} ${GROUP} "/tmp/grouptest.$$" >/dev/null 2>&1
-	if [ $? -eq 0 ]
-	then
-		echo "Group '${GROUP}' already exists...proceeding."
-	else
-		echo "Creating '${GROUP}' group..."
-		${ADDGROUP} ${GROUP}
-		echo "Done."
-	fi
-	${RM} -f "/tmp/grouptest.$$"
-
-	# Use `id' to be able to use NIS.
-	#
-	${ID} ${USER} 2>/dev/null >/dev/null
-	if [ $? -eq 0 ]
-	then
-		echo "User '${USER}' already exists...proceeding."
-	else
-		echo "Creating '${USER}' user..."
-		${ADDUSER} \
-			-c "Gale instant messaging system" \
-			-d /var/${USER} \
-			-g ${GROUP} -s /bin/sh -m ${USER}
-		echo "Done."
-	fi
-	;;
-
-POST-INSTALL)
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/chat/gale/MESSAGE b/chat/gale/MESSAGE
index 48b1ebf6ecd..5d1d350071d 100644
--- a/chat/gale/MESSAGE
+++ b/chat/gale/MESSAGE
@@ -1,5 +1,6 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 20:06:25 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2001/11/19 21:05:55 jlam Exp $
 
-  Now run ${PREFIX}/bin/gale-install as root, even after an upgrade.
+Please run ${PREFIX}/bin/gale-install as the ``root'' user, even if you
+are upgrading a previous gale installation.
 ==========================================================================
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 1b51c3bc2ff..e0e81b608f5 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/19 04:58:59 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/19 21:05:55 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -9,52 +9,46 @@ MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://gale.org
 COMMENT=	secure instant messaging system
 
-DEPENDS+=	adns-1.0:../../net/adns/
-DEPENDS+=	boehm-gc-5.3:../../devel/boehm-gc/
-DEPENDS+=	rsaref-2.0p3:../../security/rsaref/
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-.if exists(/usr/sbin/user)
-ADDUSER=	/usr/sbin/useradd
-ADDGROUP=	/usr/sbin/groupadd
-.else
-DEPENDS+=	user>=20000313:../../sysutils/user
-ADDUSER=	${LOCALBASE}/sbin/useradd
-ADDGROUP=	${LOCALBASE}/sbin/groupadd
-.endif
-.elif ${OPSYS} == "SunOS"
-ADDUSER=	useradd
-ADDGROUP=	groupadd
-.endif
-WRKSRC=		${WRKDIR}/${DISTNAME}
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
-GNU_CONFIGURE= 	YES
-USE_LIBTOOL=	YES
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CPPFLAGS+=	-I${LOCALBASE}/include/rsaref -I${LOCALBASE}/include/w3c-libwww
-
-GALE_USER=	gale
-GALE_GROUP=	gale
-
-FILES_SUBST=		GALE_USER=${GALE_USER}
-FILES_SUBST+=		GALE_GROUP=${GALE_GROUP}
-
-FILES_SUBST+=		ADDGROUP=${ADDGROUP:Q}
-FILES_SUBST+=		ADDUSER=${ADDUSER:Q}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CHGRP=${CHGRP:Q}
-FILES_SUBST+=		ID=${ID:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		TOUCH=${TOUCH:Q}
-
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+USE_BUILDLINK_ONLY=	YES
+USE_GNU_READLINE=	# needs rl_named_function()
+USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
+
+GNU_CONFIGURE= 		YES
+CONFIGURE_ARGS=		--sysconfdir=${CONFDIR}
+CONFIGURE_ENV+=		PROG_GLIB_CONFIG="${GLIB_CONFIG}"
+
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include/rsaref
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include/w3c-libwww
+
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+
+PKG_USER=		gale
+PKG_GROUP=		gale
+
+SUPPORT_FILES=		${EGDIR}/COPYING ${CONFDIR}/gale/COPYING
+SUPPORT_FILES+=		${EGDIR}/ROOT ${CONFDIR}/gale/auth/trusted/ROOT
+OWN_DIRS=		${CONFDIR}/gale
+OWN_DIRS+=		${CONFDIR}/gale/auth
+OWN_DIRS+=		${CONFDIR}/gale/auth/private
+OWN_DIRS+=		${CONFDIR}/gale/auth/trusted
+OWN_DIRS_PERMS=		${CONFDIR}/gale/auth/cache ${SHAREOWN} ${SHAREGRP} 0777
+OWN_DIRS_PERMS+=	${CONFDIR}/gale/auth/local ${SHAREOWN} ${SHAREGRP} 1777
 
 pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/kutils/ROOT ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${EGDIR}
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+
+.include "../../devel/boehm-gc/buildlink.mk"
+.include "../../devel/glib/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../net/adns/buildlink.mk"
+.include "../../security/rsaref/buildlink.mk"
+.include "../../www/libwww/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gale/PLIST b/chat/gale/PLIST
index 645fc7a6a58..98dfa4edf73 100644
--- a/chat/gale/PLIST
+++ b/chat/gale/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/19 04:58:59 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/11/19 21:05:55 jlam Exp $
 bin/gale-config
 bin/gale-install
 bin/galed
@@ -9,8 +9,6 @@ bin/gksign
 bin/gsend
 bin/gsub
 bin/gwatch
-etc/gale/COPYING
-etc/gale/auth/trusted/ROOT
 include/gale/all.h
 include/gale/auth.h
 include/gale/client.h
@@ -51,9 +49,7 @@ lib/liboop.so
 lib/liboop.so.2
 lib/liboop.so.2.0
 sbin/gksign
+share/examples/gale/COPYING
+share/examples/gale/ROOT
+@dirrm share/examples/gale
 @dirrm include/gale
-@dirrm etc/gale/auth/cache
-@dirrm etc/gale/auth/local
-@dirrm etc/gale/auth/private
-@dirrm etc/gale/auth/trusted
-@dirrm etc/gale/auth
diff --git a/chat/gale/buildlink.mk b/chat/gale/buildlink.mk
new file mode 100644
index 00000000000..1c1817adb16
--- /dev/null
+++ b/chat/gale/buildlink.mk
@@ -0,0 +1,60 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/11/19 21:05:55 jlam Exp $
+#
+# This Makefile fragment is included by packages that use gale.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gale to the dependency pattern
+#     for the version of gale desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GALE_BUILDLINK_MK)
+GALE_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gale?=	gale>=0.99
+DEPENDS+=	${BUILDLINK_DEPENDS.gale}:../../chat/gale
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gale=gale
+BUILDLINK_PREFIX.gale_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gale=		include/gale/*.h
+BUILDLINK_FILES.gale+=		include/oop-adns.h
+BUILDLINK_FILES.gale+=		include/oop-glib.h
+BUILDLINK_FILES.gale+=		include/oop-www.h
+BUILDLINK_FILES.gale+=		include/oop.h
+BUILDLINK_FILES.gale+=		lib/libgale.*
+BUILDLINK_FILES.gale+=		lib/liboop-adns.*
+BUILDLINK_FILES.gale+=		lib/liboop-glib.*
+BUILDLINK_FILES.gale+=		lib/liboop-www.*
+BUILDLINK_FILES.gale+=		lib/liboop.*
+
+.include "../../devel/glib/buildlink.mk"
+.include "../../net/adns/buildlink.mk"
+.include "../../security/rsaref/buildlink.mk"
+.include "../../www/libwww/buildlink.mk"
+
+BUILDLINK_TARGETS.gale=		gale-buildlink
+BUILDLINK_TARGETS.gale+=	gale-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gale}
+
+BUILDLINK_CONFIG.gale=		${BUILDLINK_PREFIX.gale}/bin/gale-config
+BUILDLINK_CONFIG_WRAPPER.gale=	${BUILDLINK_DIR}/bin/gale-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gale}|${BUILDLINK_CONFIG.gale}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+GALE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gale}
+CONFIGURE_ENV+=		GALE_CONFIG="${GALE_CONFIG}"
+MAKE_ENV+=		GALE_CONFIG="${GALE_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gale}
+gale-buildlink: _BUILDLINK_USE
+gale-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GALE_BUILDLINK_MK
diff --git a/chat/gale/distinfo b/chat/gale/distinfo
index 1fa0f0e6d6f..9c6f1c5d5bf 100644
--- a/chat/gale/distinfo
+++ b/chat/gale/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:07:16 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/11/19 21:05:55 jlam Exp $
 
 SHA1 (gale-0.99a.tar.gz) = c3439917c0e19ce8ccd8dd03367d0a521d6e33fd
 Size (gale-0.99a.tar.gz) = 331494 bytes
-SHA1 (patch-aa) = eef7b28bbe134c119e3000bdd9446782d2802780
+SHA1 (patch-aa) = a716a0778ce0360ea910a48218a1975883f56741
+SHA1 (patch-ab) = 44a798e452ad056f3fd920d55c3f29da06572e3f
+SHA1 (patch-ac) = e2824a69dd59d930fec334fdf7cb1b8f5d21ea78
diff --git a/chat/gale/patches/patch-aa b/chat/gale/patches/patch-aa
index 61e0509038c..a5bcfca19c2 100644
--- a/chat/gale/patches/patch-aa
+++ b/chat/gale/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2001/02/28 10:26:02 wiz Exp $
---- lib/term.c.orig	Wed Feb  7 10:32:09 2001
-+++ lib/term.c	Wed Feb  7 10:32:43 2001
-@@ -10,9 +10,11 @@
- #ifdef HAVE_CURSES_H
- #define HAVE_CURSES
- #include <curses.h>
-+#if 0 /* XXX - conflict between ncurses' term.h and netbsd's curses.h */
- #ifdef HAVE_TERM_H
- #include <term.h>
- #endif
-+#endif /* XXX - conflict between ncurses' term.h and netbsd's curses.h */
- #endif
- 
- /* This needs to be here for Solaris. */
+$NetBSD: patch-aa,v 1.3 2001/11/19 21:05:56 jlam Exp $
+
+--- Makefile.in.orig	Thu Jul 13 21:18:54 2000
++++ Makefile.in
+@@ -424,8 +424,6 @@
+ 	mkdir -p "$(sysconfdir)/gale/auth/cache"
+ 	chmod 1777 "$(sysconfdir)/gale/auth/local"
+ 	chmod 777 "$(sysconfdir)/gale/auth/cache"
+-	$(INSTALL_DATA) "$(srcdir)/kutils/ROOT" "$(sysconfdir)/gale/auth/trusted/ROOT"
+-	$(INSTALL_DATA) "$(srcdir)/COPYING" "$(sysconfdir)/gale/COPYING"
+ 	-chmod -R a+rX "$(sysconfdir)/gale"
+ 	@echo ""
+ 	@echo "*** now run $(bindir)/gale-install ... even for an upgrade ***"
diff --git a/chat/gale/patches/patch-ab b/chat/gale/patches/patch-ab
new file mode 100644
index 00000000000..c8232882c7c
--- /dev/null
+++ b/chat/gale/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2001/11/19 21:05:56 jlam Exp $
+
+--- configure.orig	Thu Jul 13 20:42:44 2000
++++ configure
+@@ -1835,10 +1835,12 @@
+ PROG_LDCONFIG=:
+ 
+ test yes = "$GCC" && CFLAGS="-Wall $CFLAGS"
++if false; then
+ test NONE != "$exec_prefix" && LDFLAGS="$LDFLAGS -L${exec_prefix}/lib"
+ if test NONE != "$prefix" ; then
+ 	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
+ 	test NONE = "$exec_prefix" && LDFLAGS="$LDFLAGS -L${prefix}/lib"
++fi
+ fi
+ 
+ case "$host" in
diff --git a/chat/gale/patches/patch-ac b/chat/gale/patches/patch-ac
new file mode 100644
index 00000000000..233db8a136f
--- /dev/null
+++ b/chat/gale/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2001/11/19 21:05:56 jlam Exp $
+
+--- liboop/configure.orig	Sat Mar 11 17:12:04 2000
++++ liboop/configure
+@@ -1991,8 +1991,8 @@
+ fi
+ 
+ if test -n "$PROG_GLIB_CONFIG" ; then
+-  GLIB_INCLUDES="`glib-config --cflags`"
+-  GLIB_LIBS="liboop-glib.la `glib-config --libs`"
++  GLIB_INCLUDES="`${PROG_GLIB_CONFIG} --cflags`"
++  GLIB_LIBS="liboop-glib.la `${PROG_GLIB_CONFIG} --libs`"
+   cat >> confdefs.h <<\EOF
+ #define HAVE_GLIB 1
+ EOF