Bug 164664 - [maintainer] mail/enma update to 1.2.0
Summary: [maintainer] mail/enma update to 1.2.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-31 14:10 UTC by Hirohisa Yamaguchi
Modified: 2012-03-04 07:00 UTC (History)
0 users

See Also:


Attachments
file.diff (286 bytes, patch)
2012-01-31 14:10 UTC, Hirohisa Yamaguchi
no flags Details | Diff
file.diff (1.78 KB, patch)
2012-01-31 14:10 UTC, Hirohisa Yamaguchi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Hirohisa Yamaguchi 2012-01-31 14:10:10 UTC
	The new version of mail/enma 1.2.0 is now available.
	Release-announcement: http://sourceforge.net/mailarchive/message.php?msg_id=28763140

Fix: The patch follows:

PORTNAME=	enma
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}

 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	A sender authentication milter supporting SPF and Sender ID

-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/dns/bind97:checksum
-
-.if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
-CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample
-.if defined(WITH_POSTFIX_CURRENT)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
-.endif
-.endif
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE

-BIND_PATH_CMD=	cd ${PORTSDIR}/dns/bind97 && ${MAKE} -V WRKSRC
-BIND_SRC_DIR=	${BASENAME} $$(${BIND_PATH_CMD})
+OPTIONS = \
+	LIBBIND	"Link against dns/libbind instead of dns/ldns"	Off

 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/man \
-			--with-libbind=${WRKSRC}/build/tmp_build
+			--with-ssl-incdir=${OPENSSLINC} --with-ssl-libdir=${OPENSSLLIB}
 USE_RC_SUBR=	milter-enma
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
 USE_PERL5_BUILD=yes
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/LICENSE
 MANLANG=	"" ja_JP.UTF-8
 MAN1=		enma.1
 MANCOMPRESSED=	no
-PLIST_FILES=	libexec/enma bin/sidfquery etc/enma.conf.sample
-PORTDOCS=	ChangeLog INSTALL LICENSE README TODO
+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

+.if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
+CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample
+. if defined(WITH_POSTFIX_CURRENT)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
+. else
+RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
+. endif
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-USE_OPENSSL=	yes
-.if ${OSVERSION} < 700000
-WITH_OPENSSL_PORT=	yes
+.if defined(WITH_LIBBIND)
+CONFIGURE_ARGS+=	--with-resolver=libbind \
+			--with-libbind-incdir=${LOCALBASE}/include/bind \
+			--with-libbind-libdir=${LOCALBASE}/lib
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libbind.a:${PORTSDIR}/dns/libbind
+.else
+CONFIGURE_ARGS+=	--with-resolver=ldns
+LIB_DEPENDS+=	ldns.1:${PORTSDIR}/dns/ldns
 .endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"

 pre-configure:
-	cd ${PORTSDIR}/dns/bind97 && ${MAKE} -DBATCH patch && \
-	${LN} -s $$(${BIND_PATH_CMD}) ${WRKSRC}/build && \
-	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR}) && \
-	./configure --prefix=${WRKSRC}/build/tmp_build --enable-threads && \
-	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/dns && \
-	${MAKE} include/dns/enumtype.h include/dns/enumclass.h && \
-	cd ${WRKSRC}/build/$$(${BIND_SRC_DIR})/lib/bind9 && \
-	${MAKE} && ${MAKE} install
-	${REINPLACE_CMD} -e 's/-lbind/-lbind9/' ${WRKSRC}/configure \
-	${WRKSRC}/enma/bin/Makefile.in ${WRKSRC}/enma/src/Makefile.in
 	$$(${CONF_SUB})

 post-install:
How-To-Repeat: 	N/A
Comment 1 Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2012-01-31 17:23:06 UTC
State Changed
From-To: open->feedback

Would you please resend the patch or upload it somewhere. It got broken 
in GNATS. Thanks.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2012-02-01 11:21:47 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2012-03-04 06:55:19 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2012-03-04 06:55:20 UTC
miwi        2012-03-04 06:55:04 UTC

  FreeBSD ports repository

  Modified files:
    mail/enma            Makefile distinfo 
    mail/enma/files      patch-enma_etc_enma.conf.sample 
  Added files:
    mail/enma/files      patch-enma_src_enma.c 
  Removed files:
    mail/enma/files      patch-enma_src_addr_util.c 
  Log:
  - Update to 1.2.0
  
  PR:             164664
  Submitted by:   maintainer
  
  Revision  Changes    Path
  1.10      +27 -33    ports/mail/enma/Makefile
  1.4       +2 -2      ports/mail/enma/distinfo
  1.3       +0 -9      ports/mail/enma/files/patch-enma_etc_enma.conf.sample
  1.2       +0 -10     ports/mail/enma/files/patch-enma_src_addr_util.c (dead)
  1.1       +10 -0     ports/mail/enma/files/patch-enma_src_enma.c (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"