From owner-svn-ports-head@FreeBSD.ORG Tue Jul 8 15:04:44 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BECC2223; Tue, 8 Jul 2014 15:04:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A9A522D5A; Tue, 8 Jul 2014 15:04:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68F4ihd022456; Tue, 8 Jul 2014 15:04:44 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68F4ia5022450; Tue, 8 Jul 2014 15:04:44 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407081504.s68F4ia5022450@svn.freebsd.org> From: John Marino Date: Tue, 8 Jul 2014 15:04:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361256 - head/mail/enma X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 15:04:44 -0000 Author: marino Date: Tue Jul 8 15:04:43 2014 New Revision: 361256 URL: http://svnweb.freebsd.org/changeset/ports/361256 QAT: https://qat.redports.org/buildarchive/r361256/ Log: mail/enma: stage, explicit linking to libssl (dports) While here: * convert from PLIST to pkg-plist * convert to new LIB_DEPENDS format * change 
 &  includes to 

Added:
  head/mail/enma/pkg-plist   (contents, props changed)
Modified:
  head/mail/enma/Makefile

Modified: head/mail/enma/Makefile
==============================================================================
--- head/mail/enma/Makefile	Tue Jul  8 15:00:57 2014	(r361255)
+++ head/mail/enma/Makefile	Tue Jul  8 15:04:43 2014	(r361256)
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sender authentication milter supporting SPF and Sender ID
 
 LICENSE=	BSD
@@ -17,19 +17,18 @@ OPTIONS_DEFINE=	LIBBIND
 LIBBIND_DESC=	Link against dns/libbind instead of dns/ldns
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/man \
-			--with-ssl-incdir=${OPENSSLINC} --with-ssl-libdir=${OPENSSLLIB}
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--mandir=${PREFIX}/man \
+		--with-ssl-incdir=${OPENSSLINC} \
+		--with-ssl-libdir=${OPENSSLLIB}
 
 USES=		gmake perl5
 USE_RC_SUBR=	milter-enma
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	build
+LDFLAGS+=	-lssl
 MANLANG=	"" ja_JP.UTF-8
-MAN1=		enma.1
-MANCOMPRESSED=	no
-PLIST_FILES=	bin/sidfquery etc/enma.conf.sample lib/libsauth.a lib/libsauth.la \
-		lib/libsauth.so lib/libsauth.so.0 libexec/enma
 PORTDOCS=	ChangeLog INSTALL LICENSE README
 SUB_FILES=	milter-enma
 
@@ -42,8 +41,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/postf
 . endif
 .endif
 
-NO_STAGE=	yes
-.include 
+.include 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 .if ${PORT_OPTIONS:MLIBBIND}
@@ -53,21 +51,20 @@ CONFIGURE_ARGS+=	--with-resolver=libbind
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libbind.a:${PORTSDIR}/dns/libbind
 .else
 CONFIGURE_ARGS+=	--with-resolver=ldns
-LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libldns.so:${PORTSDIR}/dns/ldns
 .endif
 
 pre-configure:
 	$$(${CONF_SUB})
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample ${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/enma/etc/enma.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.  for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.  endfor
 .endif
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/man/ja_JP.UTF-8/man1 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/man/ja_JP.UTF-8 2>/dev/null || true" >> ${TMPPLIST}
 
-.include 
+.include 

Added: head/mail/enma/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/enma/pkg-plist	Tue Jul  8 15:04:43 2014	(r361256)
@@ -0,0 +1,11 @@
+bin/sidfquery
+etc/enma.conf.sample
+lib/libsauth.a
+lib/libsauth.la
+lib/libsauth.so
+lib/libsauth.so.0
+libexec/enma
+man/ja_JP.UTF-8/man1/enma.1.gz
+man/man1/enma.1.gz
+@dirrmtry man/ja_JP.UTF-8/man1
+@dirrmtry man/ja_JP.UTF-8