From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 1 18:10:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8180A106577B for ; Mon, 1 Oct 2012 18:10:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 152548FC17 for ; Mon, 1 Oct 2012 18:10:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q91IACqL014671 for ; Mon, 1 Oct 2012 18:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q91IACB2014662; Mon, 1 Oct 2012 18:10:12 GMT (envelope-from gnats) Resent-Date: Mon, 1 Oct 2012 18:10:12 GMT Resent-Message-Id: <201210011810.q91IACB2014662@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C9431065679 for ; Mon, 1 Oct 2012 18:02:27 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 1A9948FC1A for ; Mon, 1 Oct 2012 18:02:27 +0000 (UTC) Received: from localhost.localdomain (ZT037251.ppp.dion.ne.jp [59.128.37.251]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id BE40050036 for ; Tue, 2 Oct 2012 03:02:23 +0900 (JST) Message-Id: <20121002025425.007ae5ad2c6a502ca7fd3b4d@yahoo.com> Date: Tue, 2 Oct 2012 02:54:25 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/172243: mail/smfsav: Update MASTER_SITES X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 18:10:13 -0000 >Number: 172243 >Category: ports >Synopsis: mail/smfsav: Update MASTER_SITES >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 01 18:10:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update MASTER_SITES - Add LICENSE - Fix build on 9-stable Remove file: files/patch-Makefile files/patch-getaddrinfo.c files/patch-irpmarshall.c >How-To-Repeat: >Fix: diff -urN /usr/ports/mail/smfsav/Makefile mail/smfsav/Makefile --- /usr/ports/mail/smfsav/Makefile 2012-01-08 11:28:24.000000000 +0900 +++ mail/smfsav/Makefile 2012-10-02 00:11:56.000000000 +0900 @@ -7,58 +7,49 @@ PORTNAME= smfsav PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= mail -MASTER_SITES= SF/smfs/smf-sav/smf-sav-${PORTVERSION}:0 \ - ${MASTER_SITE_ISC}:1 -MASTER_SITE_SUBDIR= smfs/:0 \ - bind8/src/8.4.7/:1 -DISTNAME= smf-sav-1.4.0 -DISTFILES= smf-sav-1.4.0.tar.gz:0 \ - bind-src.tar.gz:1 +MASTER_SITES= SF/smfs +DISTNAME= smf-sav-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Sendmail Sender Address Validator -PLIST_FILES= sbin/smfsav \ - etc/smfsav.conf-dist +LICENSE= GPLv2 -.if !defined(NOPORTDOCS) -PLIST_FILES+= %%PORTDOCS%%%%DOCSDIR%%/COPYING \ - %%PORTDOCS%%%%DOCSDIR%%/CHANGES \ - %%PORTDOCS%%%%DOCSDIR%%/README -PLIST_DIRS= share/doc/${PORTNAME} -.endif +OPTIONS_DEFINE= DOCS USE_RC_SUBR= smfsav +CPPFLAGS+= -D_REENTRANT ${PTHREAD_CFLAGS} +LDFLAGS+= -lmilter ${PTHREAD_LIBS} + SUB_FILES= pkg-message +PORTDOCS= CHANGES README +PLIST_FILES= sbin/smfsav \ + etc/smfsav.conf-dist + .include -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/readme -pre-build: - @${ECHO} - @${ECHO} [*] Compiling BIND 8 to make SmfSav able to resolve DNS names - ${MAKE} all -C ${WRKDIR}/src - @${ECHO} - @${ECHO} [*] Compiling SmfSav +do-build: + (cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c \ + ${LDFLAGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/smf-sav ${PREFIX}/sbin/smfsav - ${INSTALL_DATA} ${WRKSRC}/smf-sav.conf ${PREFIX}/etc/smfsav.conf-dist - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/COPYING - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}/CHANGES - ${INSTALL_DATA} ${WRKSRC}/readme ${DOCSDIR}/README + (cd ${WRKSRC} \ + && ${INSTALL_PROGRAM} smf-sav ${PREFIX}/sbin/smfsav \ + && ${INSTALL_DATA} smf-sav.conf ${PREFIX}/etc/smfsav.conf-dist) +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + (cd ${WRKSRC} \ + && ${INSTALL_DATA} ChangeLog ${DOCSDIR}/CHANGES \ + && ${INSTALL_DATA} readme ${DOCSDIR}/README) .endif - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} diff -urN /usr/ports/mail/smfsav/files/patch-Makefile mail/smfsav/files/patch-Makefile --- /usr/ports/mail/smfsav/files/patch-Makefile 2008-02-18 06:16:46.000000000 +0900 +++ mail/smfsav/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,48 +0,0 @@ ---- Makefile.orig 2006-10-25 23:15:10.000000000 +0300 -+++ Makefile 2008-02-17 14:19:30.000000000 +0200 -@@ -1,17 +1,17 @@ - CC = gcc - PREFIX = /usr/local - SBINDIR = $(PREFIX)/sbin --DATADIR = /var/run/smfs --CONFDIR = /etc/mail/smfs --USER = smfs --GROUP = smfs --CFLAGS = -O2 -D_REENTRANT -fomit-frame-pointer -I/usr/local/include -+DATADIR = /var/run/smfsav -+CONFDIR = $(PREFIX)/etc -+USER = smfsav -+GROUP = smfsav -+CFLAGS = -O2 -D_REENTRANT -fomit-frame-pointer -I../src/include - - # Linux --LDFLAGS = -lmilter -lpthread -lresolv -+#LDFLAGS = -lmilter -lpthread -lresolv - - # FreeBSD (BIND v8 is required) --#LDFLAGS = -lmilter -pthread -L/usr/local/lib -lbind_r -+LDFLAGS = -lmilter -pthread -L../src/lib -lbind_r - - # Solaris - #LDFLAGS = -lmilter -lpthread -lsocket -lnsl -lresolv -@@ -30,20 +30,3 @@ - - clean: - rm -f smf-sav.o smf-sav -- --install: -- @./install.sh -- @cp -f -p smf-sav $(SBINDIR) -- @if test ! -d $(DATADIR); then \ -- mkdir -m 700 $(DATADIR); \ -- chown $(USER):$(GROUP) $(DATADIR); \ -- fi -- @if test ! -d $(CONFDIR); then \ -- mkdir -m 755 $(CONFDIR); \ -- fi -- @if test ! -f $(CONFDIR)/smf-sav.conf; then \ -- cp -p smf-sav.conf $(CONFDIR)/smf-sav.conf; \ -- else \ -- cp -p smf-sav.conf $(CONFDIR)/smf-sav.conf.new; \ -- fi -- @echo Please, inspect and edit the $(CONFDIR)/smf-sav.conf file. diff -urN /usr/ports/mail/smfsav/files/patch-getaddrinfo.c mail/smfsav/files/patch-getaddrinfo.c --- /usr/ports/mail/smfsav/files/patch-getaddrinfo.c 2008-07-09 19:46:48.000000000 +0900 +++ mail/smfsav/files/patch-getaddrinfo.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- ../src/lib/irs/getaddrinfo.c.orig 2008-06-25 18:33:53.000000000 +0000 -+++ ../src/lib/irs/getaddrinfo.c 2008-06-25 18:34:20.000000000 +0000 -@@ -332,7 +332,7 @@ - pai->ai_family = PF_UNSPEC; - pai->ai_socktype = ANY; - pai->ai_protocol = ANY; --#ifdef __sparcv9 -+#if defined __sparcv9 && !defined(__FreeBSD__) - /* - * clear _ai_pad to preserve binary - * compatibility with previously compiled 64-bit -@@ -365,7 +365,7 @@ - } - memcpy(pai, hints, sizeof(*pai)); - --#ifdef __sparcv9 -+#if defined __sparcv9 && !defined(__FreeBSD__) - /* - * We need to clear _ai_pad to preserve binary - * compatibility. See prior comment. diff -urN /usr/ports/mail/smfsav/files/patch-irpmarshall.c mail/smfsav/files/patch-irpmarshall.c --- /usr/ports/mail/smfsav/files/patch-irpmarshall.c 2009-03-15 07:43:05.000000000 +0900 +++ mail/smfsav/files/patch-irpmarshall.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,16 +0,0 @@ ---- ../src/lib/irs/irpmarshall.c.orig 2009-02-22 15:17:43.000000000 +0000 -+++ ../src/lib/irs/irpmarshall.c 2009-02-22 15:25:53.000000000 +0000 -@@ -89,6 +89,12 @@ - - #include "port_after.h" - -+#if defined(__FreeBSD__) -+#include -+#if __FreeBSD_version >= 800058 || __FreeBSD_version >= 701101 && __FreeBSD_version < 800000 -+#define HAVE_STRNDUP 1 -+#endif -+#endif - - #ifndef HAVE_STRNDUP - static char *strndup(const char *str, size_t len); - diff -urN /usr/ports/mail/smfsav/files/patch-readme mail/smfsav/files/patch-readme --- /usr/ports/mail/smfsav/files/patch-readme 2008-02-18 06:16:46.000000000 +0900 +++ mail/smfsav/files/patch-readme 2012-10-01 14:46:50.000000000 +0900 @@ -5,13 +5,13 @@ make install - Inspect and edit the /etc/mail/smfs/smf-sav.conf file. -+ Inspect and edit the /usr/local/etc/smfsav.conf file. ++ Inspect and edit the %%PREFIX%%/etc/smfsav.conf file. -/usr/local/sbin/smf-sav -+/usr/local/sbin/smfsav ++%%PREFIX%%/sbin/smfsav or -/usr/local/sbin/smf-sav -c /etc/mail/smfs/smf-sav.conf -+/usr/local/sbin/smfsav -c /usr/local/etc/smfsav.conf ++%%PREFIX%%/sbin/smfsav -c %%PREFIX%%/etc/smfsav.conf Add this milter to start-up scripts before starting a Sendmail daemon. Look at the contributed samples of start-up scripts. >Release-Note: >Audit-Trail: >Unformatted: