- change dist site to ${MASTER_SITE_BACKUP}

- properly install sample queso.conf in /etc
- fix port so it installs properly when made into a package
- Fake

net/queso/Makefile

@@ -1,23 +1,28 @@
-# $OpenBSD: Makefile,v 1.7 2000/02/15 05:04:58 turan Exp $
+# $OpenBSD: Makefile,v 1.8 2000/03/25 06:50:03 brad Exp $
 
 DISTNAME=	queso-980922
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/FreeBSD/distfiles/
+NEED_VERSION=	1.234
+MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 MAINTAINER=	brad@openbsd.org
 
-LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-GNU_CONFIGURE=	yes
+FAKE=	Yes
 
-post-install:
+GNU_CONFIGURE=	Yes
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/queso
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/queso
+	${INSTALL_DATA} ${WRKSRC}/queso.conf ${PREFIX}/lib/queso/queso.conf.sample
 	${INSTALL_MAN} ${FILESDIR}/queso.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/queso ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/Documentation.txt ${PREFIX}/share/doc/queso
 
 .include <bsd.port.mk>

net/queso/patches/patch-ad

@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Mar 24 20:32:01 2000
++++ Makefile.in	Fri Mar 24 20:36:01 2000
+@@ -14,7 +14,7 @@
+ LANGUAGE=-DENGLISH
+ # LANGUAGE=-DSPANISH
+ CFGFILE=-DDFLT_CONFIG_FILE=\"@sysconfdir@/queso.conf\" 
+-CFLAGS=-O2 -pipe $(WARNINGS) $(LANGUAGE) $(CFGFILE) @CFLAGS@  
++CFLAGS+=-pipe $(WARNINGS) $(LANGUAGE) $(CFGFILE) @CFLAGS@  
+ LDFLAGS+=-s
+ ######################################################
+ DAEMONMODE=4755

net/queso/pkg/DEINSTALL

@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 2000/03/25 06:50:03 brad Exp $
+#
+# queso de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=/etc/queso.conf
+
+if [ -f ${CONFIG_FILE} ]; then
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| this step as root:"
+    echo "|"
+    echo "|           rm -f ${CONFIG_FILE}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+fi
+
+exit 0

net/queso/pkg/INSTALL

@@ -0,0 +1,68 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/03/25 06:50:03 brad Exp $
+#
+# Pre/post-installation setup of queso
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=/etc/queso.conf
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    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/queso/queso.conf.sample,"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+# Function: install the system queso.conf from the sample
+#
+do_install()
+{
+    install -o root -g wheel -m 644 ${PREFIX}/lib/queso/queso.conf.sample ${CONFIG_FILE}
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f $CONFIG_FILE ]; then
+	    do_notice $1
+	else
+	    do_install $1
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0

net/queso/pkg/PLIST

@@ -1,4 +1,6 @@
+lib/queso/queso.conf.sample
 man/man1/queso.1
 sbin/queso
 share/doc/queso/Documentation.txt
+@dirrm lib/queso
 @dirrm share/doc/queso