- revert most of patch-aa and instead use a combination of MAKE_FLAGS and

our own install target, this also has the affect of not unnecessarily
creating the spool dir durring the fake install
- add INSTALL script

mail/cucipop/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2000/03/27 17:26:04 form Exp $
+# $OpenBSD: Makefile,v 1.7 2000/03/28 08:46:24 brad Exp $
 
 DISTNAME=       cucipop-1.31
 CATEGORIES=	mail
@@ -13,4 +13,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 FAKE=		Yes
 
+MAKE_FLAGS=	CFLAGS="${CFLAGS}" LDFLAGS=""
+
+do-install:
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} cucipop makevpopdb ${PREFIX}/libexec
+	cd ${WRKSRC}; ${INSTALL_MAN} cucipop.8 makevpopdb.8 ${PREFIX}/man/man8
+
 .include <bsd.port.mk>

mail/cucipop/patches/patch-aa

@@ -1,43 +1,5 @@
-# $OpenBSD: patch-aa,v 1.4 2000/03/27 17:26:06 form Exp $
-
---- Makefile.orig	Wed May 13 04:09:14 1998
-+++ Makefile	Tue Mar 28 01:09:54 2000
-@@ -1,6 +1,6 @@
- #$Id: patch-aa,v 1.4 2000/03/27 17:26:06 form Exp $
- 
--BASENAME= /usr
-+BASENAME= $(PREFIX)
- 
- GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-  -Wpointer-arith -Wconversion -Waggregate-return \
-@@ -10,21 +10,21 @@
- # Omit USE_DB if you don't have the -ldb2 library (Berkeley DB, v2.x)
- # WARNING: bulletins are not remembered to have been deleted without USE_DB
- 
--CFLAGS	= -O -DUSE_DB #$(GCC_WARNINGS)
--LDFLAGS = -lcrypt -ldb2
-+#CFLAGS	+= #-DUSE_DB #$(GCC_WARNINGS)
-+#LDFLAGS = 
- 
- # If you change this, edit config.h as well
--CUCIPOPLIB=/var/lib/cucipop
-+CUCIPOPLIB=/var/spool/cucipop
- CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
- 
- O=o
- 
--BINDIR=$(BASENAME)/sbin
-+BINDIR=$(BASENAME)/libexec
- MANDIR=$(BASENAME)/man/man8
- 
- INSTALL=install -o root -m
--BINPERM=02755 -s -g mail
--REGPERM=0644
-+BINPERM=755 -s -g bin
-+REGPERM=444
- 
- #
- # When compiling without APOP support, the md5 library can be omitted.
+--- Makefile.orig	Tue May 12 17:09:14 1998
++++ Makefile	Mon Mar 27 15:25:45 2000
 @@ -32,7 +32,7 @@
  MD5_OBJ=md5/md5c.$(O)
  
@@ -47,14 +9,3 @@
  
  BINS=cucipop makevpopdb
  
-@@ -70,8 +70,8 @@
- install: $(BINS) $(MANS)
- 	$(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
- 	$(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
--	mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0
--	mkdir $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
-+	mkdir -p $(CUCIPOPLIB) 2>/dev/null; exit 0
-+	mkdir -p $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
- 	@for a in $(BINS); do ls -l $(BINDIR)/$$a; done
- 	@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
- 

mail/cucipop/pkg/INSTALL

@@ -0,0 +1,43 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/03/28 08:46:25 brad Exp $
+#
+# Pre/post-installation setup of cucipop
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+SPOOL_DIR=/var/spool/cucipop
+
+# Function: install the cucipop spool dir
+#
+do_install()
+{
+    install -d -o root -g wheel -m 755 ${SPOOL_DIR}
+    install -d -o root -g wheel -m 755 ${SPOOL_DIR}/bulletins
+}
+
+# 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)
+	do_install
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0

mail/cucipop/pkg/PLIST

@@ -2,5 +2,3 @@ libexec/cucipop
 libexec/makevpopdb
 man/man8/cucipop.8
 man/man8/makevpopdb.8
-@exec mkdir -p /var/spool/cucipop
-@exec mkdir -p /var/spool/cucipop/bulletins