Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Apr 2014 15:15:51 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r350722 - head/emulators/dynamips
Message-ID:  <201404091515.s39FFpOs092783@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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