move CFLAGS and LD_LIBS to pkgsrc Makefile and clean up install

targets so platforms other than *BSD have a chance of building.

install /etc/TIMEZONE on Solaris.

XXX this package still needs more work to be useful on Solaris
and other platforms.

3 files changed, 76 insertions, 19 deletions

diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index cfe63d9ac4f..c558175ed79 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:53:15 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/08 14:27:35 grant Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -14,16 +14,38 @@ COMMENT=	Store and forward SMTP proxy
 
 SPOOL=		/var/spool/smtpd
 
-pre-install:
-		-${INSTALL_DATA_DIR} ${SPOOL}/etc
-		for f in antirelay_check_rules_example antispam_check_rules.example smtpd_check_rules.example ; do ${INSTALL_DATA} ${WRKSRC}/$$f ${SPOOL}/etc; done
-		${CHOWN} -R uucp.mail ${SPOOL}
-		${CHMOD} -R g=,o= ${SPOOL}
-		${CP} /etc/localtime /etc/resolv.conf ${SPOOL}/etc
+# taken directly from the Makefile.
+CFLAGS.NetBSD=	-DUSE_FLOCK -DUSE_MKSTEMP
+CFLAGS.SunOS=	-DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES
+CFLAGS.IRIX=	-DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES
+CFLAGS.AIX=	-DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H
+OPSYSVARS=	LD_LIBS
+LD_LIBS.SunOS=	-lnsl -lsocket -lresolv
+MAKE_ENV+=	LD_LIBS="${LD_LIBS}"
 
-post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smtpd
+.include "../../mk/bsd.prefs.mk"
+
+do-install:
+	-${INSTALL_DATA_DIR} ${SPOOL}/etc
+	${INSTALL} -m 500 ${WRKSRC}/smtpd ${PREFIX}/sbin/smtpd
+	${INSTALL} -m 500 ${WRKSRC}/smtpfwdd ${PREFIX}/sbin/smtpfwdd
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smtpd
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/smtpd
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/smtpd
 
+post-install:
+.for f in antirelay_check_rules_example antispam_check_rules.example \
+	smtpd_check_rules.example
+	${INSTALL_DATA} ${WRKSRC}/${f} ${SPOOL}/etc
+.endfor
+	${CHOWN} -R uucp ${SPOOL}
+	${CHGRP} -R mail ${SPOOL}
+	${CHMOD} -R g=,o= ${SPOOL}
+	${CP} /etc/resolv.conf ${SPOOL}/etc
+.if ${OPSYS} == "SunOS"
+	${CP} /etc/TIMEZONE ${SPOOL}/etc
+.else
+	${CP} /etc/localtime ${SPOOL}/etc
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smtpd/distinfo b/security/smtpd/distinfo
index b62856c4aed..4140a9bf4d1 100644
--- a/security/smtpd/distinfo
+++ b/security/smtpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/11/30 14:56:53 mjl Exp $
+$NetBSD: distinfo,v 1.4 2004/02/08 14:27:35 grant Exp $
 
 SHA1 (smtpd-2.0.tar.gz) = 7c619e01a1e7b1baa23435159ba67894d5550188
 Size (smtpd-2.0.tar.gz) = 62605 bytes
 SHA1 (patch-smtpd-2.0-RBL.gz) = 180bfcca83cb5e0523cf5d983083ed83bacdde7f
 Size (patch-smtpd-2.0-RBL.gz) = 3829 bytes
-SHA1 (patch-aa) = 2600fe1a486697c5a92a35fa14724b06b02555f5
+SHA1 (patch-aa) = 937e7d97d9060b848328b6cc084378f9cb334a00
 SHA1 (patch-ab) = 717ffbe58c771967ef2ce6a1ea56003535929ccf
diff --git a/security/smtpd/patches/patch-aa b/security/smtpd/patches/patch-aa
index 31ab89b7beb..d11ecb4409c 100644
--- a/security/smtpd/patches/patch-aa
+++ b/security/smtpd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/08 14:27:35 grant Exp $
 
---- Makefile.orig	Thu Apr 20 18:23:56 2000
-+++ Makefile	Thu Apr 20 18:29:42 2000
+--- Makefile.orig	1997-10-13 11:40:34.000000000 +1000
++++ Makefile
 @@ -1,7 +1,7 @@
  ##########################################################
  ## Where do I get installed? #############################
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  INSTALL_BIN = sbin/
  INSTALL_MAN = man/
  
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ MAIL_AGENT = /usr/sbin/sendmail
  # sendmail or whatever you are using as MAIL_AGENT above so that the user
  # may use the "-f" flag to specify the sender of a mail message.
  SMTP_USER = uucp
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  
  # smtpd and smtpfwdd generate lots of syslogs, by design.
  #
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ LOG_FACILITY = LOG_MAIL
  # in SMTP_USER above.
  #
  # The chroot directory
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  # Where to store messages, relative to SPOOLDIR above.
  SPOOLSUBDIR = .
  #Use below instead of above if you don't want smtpd to chroot. This
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ SPOOLSUBDIR = .
  
  # How frequently (in seconds) should smtpfwdd wake up to check the
  # spool directory for new mail? 
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  
  # What is the maximum number of children smtpfwdd should spawn at one time
  # when delivering messages before waiting for some to complete? This ensures
-@@ -206,8 +206,8 @@
+@@ -206,8 +206,8 @@ CHECK_ADDRESS = 1
  # build with CHECK_ADDRESS set to 1. You will get an error about
  # juniper_firewall.h not existing if you forget this.
  #
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  
  # Use regexp's in patterns?  If you have a POSIX <regex.h> and friends, 
  # and you trust the regex lib enough for use, you can set USE_REGEX to 
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ USE_REGEX=1
  #
  #NS_MATCH=0
  NS_MATCH=1
@@ -58,3 +58,38 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/21 10:57:33 mjl Exp $
  
  # The rules file for address checking, if enabled, remember this file
  # will be in the chroot jail, so the line below probably means
+@@ -318,14 +318,14 @@ OPTIONS = -DMAIL_AGENT=\"$(MAIL_AGENT)\"
+ 
+ ## CC of choice.
+ #CC = cc
+-CC = gcc
++#CC = gcc
+ 
+ ####################################################
+ ###### Uncomment your Operating System below #######
+ ####################################################
+ 
+ # The Source is with you (*BSD 4.4, Linux)
+-CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_MKSTEMP $(OPTIONS)
++#CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_MKSTEMP $(OPTIONS)
+ 
+ 
+ #SunOS 5.X
+@@ -343,14 +343,15 @@ CFLAGS = -g -O -Wall -DUSE_FLOCK -DUSE_M
+ #AIX
+ #CFLAGS = -g -O -Wall -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H  $(OPTIONS)
+ 
++CFLAGS+=$(OPTIONS)
+ 
+ all: smtpd smtpfwdd
+ 
+ smtpd:	smtpd.o address_check.o
+-	$(CC) -o smtpd smtpd.o address_check.o $(LD_LIBS)
++	$(CC) $(CFLAGS) -o smtpd smtpd.o address_check.o $(LD_LIBS)
+ 
+ smtpfwdd:	smtpfwdd.o
+-	$(CC) -o smtpfwdd smtpfwdd.o $(LD_LIBS)
++	$(CC) $(CFLAGS) -o smtpfwdd smtpfwdd.o $(LD_LIBS)
+ 
+ smtpd.o:	smtpd.c smtpd.h smtp.h 
+