Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Aug 2013 08:50:30 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r325257 - head/mail/lmtp2nntp
Message-ID:  <201308230850.r7N8oUn8009663@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri Aug 23 08:50:30 2013
New Revision: 325257
URL: http://svnweb.freebsd.org/changeset/ports/325257

Log:
  - Attempt to unbreak parallel (-jX) builds by fixing targets dependencies
  - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS, modernize LIB_DEPENDS
  - Connect "check" target to our standard "regression-test" that automated
    package builders know about
  - Trim the header and drop check for alpha: unfortunately, it's long gone
  
  Reported by:	marino
  Approved by:	miwi, bapt (portmgr, implicit)

Modified:
  head/mail/lmtp2nntp/Makefile

Modified: head/mail/lmtp2nntp/Makefile
==============================================================================
--- head/mail/lmtp2nntp/Makefile	Fri Aug 23 08:39:12 2013	(r325256)
+++ head/mail/lmtp2nntp/Makefile	Fri Aug 23 08:50:30 2013	(r325257)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	lmtp2nntp
-# Date created:				12 November 2001
-# Whom:	      				Thomas Lotterer <thomas.lotterer@cw.com>
-#
+# Created by: Thomas Lotterer <thomas.lotterer@cw.com>
 # $FreeBSD$
-#
 
 PORTNAME=	lmtp2nntp
 PORTVERSION=	1.4.1
@@ -14,10 +10,10 @@ MASTER_SITE_SUBDIR=	tool/${PORTNAME}
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	OSSP mail to news gateway
 
-LIB_DEPENDS=	str.9:${PORTSDIR}/devel/str \
-		ex.10:${PORTSDIR}/devel/ossp-ex \
-		sa.12:${PORTSDIR}/net/ossp-sa \
-		var.11:${PORTSDIR}/devel/ossp-var
+LIB_DEPENDS=	libstr.so:${PORTSDIR}/devel/str \
+		libex.so:${PORTSDIR}/devel/ossp-ex \
+		libsa.so:${PORTSDIR}/net/ossp-sa \
+		libvar.so:${PORTSDIR}/devel/ossp-var
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ex=${LOCALBASE} --with-str=${LOCALBASE} \
@@ -25,26 +21,27 @@ CONFIGURE_ARGS=	--with-ex=${LOCALBASE} -
 
 MAN8=		lmtp2nntp.8
 PLIST_FILES=	sbin/lmtp2nntp
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	INSTALL README
-.endif
 
-check: build
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+# Try to fix parallel builds (-jX)
+post-patch:
+	@${REINPLACE_CMD} -e '/^all:/s, _SUBDIRS_all,, ; \
+		/^$$(PROG)/s,$$, _SUBDIRS_all,' ${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
+check: build
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} check)
 
-.if ${ARCH} == "alpha"
-BROKEN=		Does not compile on alpha
-.endif
+regression-test: check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308230850.r7N8oUn8009663>