From owner-svn-ports-all@FreeBSD.ORG  Wed Apr  9 15:15:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D11016F;
 Wed,  9 Apr 2014 15:15:51 +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 614DD1526;
 Wed,  9 Apr 2014 15:15:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39FFpfi092784;
 Wed, 9 Apr 2014 15:15:51 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39FFpOs092783;
 Wed, 9 Apr 2014 15:15:51 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404091515.s39FFpOs092783@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Wed, 9 Apr 2014 15:15:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350722 - head/emulators/dynamips
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Apr 2014 15:15:51 -0000

Author: pawel
Date: Wed Apr  9 15:15:50 2014
New Revision: 350722
URL: http://svnweb.freebsd.org/changeset/ports/350722
QAT: https://qat.redports.org/buildarchive/r350722/

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format, USES=gmake
  - Register CONFLICTS
  - Define DOCS option

Modified:
  head/emulators/dynamips/Makefile

Modified: head/emulators/dynamips/Makefile
==============================================================================
--- head/emulators/dynamips/Makefile	Wed Apr  9 15:14:54 2014	(r350721)
+++ head/emulators/dynamips/Makefile	Wed Apr  9 15:15:50 2014	(r350722)
@@ -10,25 +10,22 @@ MASTER_SITES=	http://www.ipflow.utc.fr/d
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cisco 3600/7200 Simulator
 
-LIB_DEPENDS=	elf.0:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libelf.so:${PORTSDIR}/devel/libelf
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	${PORTNAME} nvram_export
 MAKE_ENV=	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
-		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
-.if !defined(NOPORTDOCS)
+CONFLICTS=	dynamips-community-[0-9]* dynamips-devel-[0-9]*
+
+PLIST_FILES=	bin/${PORTNAME} bin/nvram_export man/man1/${PORTNAME}.1.gz \
+		man/man1/nvram_export.1.gz man/man7/hypervisor_mode.7.gz
 PORTDOCS=	README README.hypervisor
-.endif
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		${PORTNAME}.1 nvram_export.1
-MAN7=		hypervisor_mode.7
-.endif
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -42,17 +39,13 @@ DYNAMIPS_ARCH=	"nojit"
 MAKE_ENV+=	HAS_POSIX_MEMALIGN=1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${DOCSDIR}
-.endif
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/nvram_export.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/hypervisor_mode.7 ${PREFIX}/man/man7
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/nvram_export.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/hypervisor_mode.7 ${STAGEDIR}${PREFIX}/man/man7
 
 .include <bsd.port.post.mk>