Date: Sat, 25 Jan 2014 16:29:42 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341048 - in head/emulators/dynamips-community: . files Message-ID: <201401251629.s0PGTgBG090264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Jan 25 16:29:42 2014 New Revision: 341048 URL: http://svnweb.freebsd.org/changeset/ports/341048 QAT: https://qat.redports.org/buildarchive/r341048/ Log: emulations/dynamips-community: Update to 0.2.10, support stage Additionally from marino@: * Use OPSYS with OVERSION * Properly set LIB_DEPENDS * Treat x86-64 like amd64 * Fixed line ending on pkg-descr PR: ports/185642 Submitted by: maintainer (Pavel Volkov) Fixed by: marino@ Deleted: head/emulators/dynamips-community/files/ Modified: head/emulators/dynamips-community/Makefile head/emulators/dynamips-community/distinfo head/emulators/dynamips-community/pkg-descr Modified: head/emulators/dynamips-community/Makefile ============================================================================== --- head/emulators/dynamips-community/Makefile Sat Jan 25 16:18:54 2014 (r341047) +++ head/emulators/dynamips-community/Makefile Sat Jan 25 16:29:42 2014 (r341048) @@ -2,44 +2,42 @@ # $FreeBSD$ PORTNAME= dynamips -PORTVERSION= 0.2.8 +PORTVERSION= 0.2.10 CATEGORIES= emulators -MASTER_SITES= SF/gns-3/Dynamips/${PORTVERSION}-RC3${PKGNAMESUFFIX} +MASTER_SITES= SF/gns-3/Dynamips/${PORTVERSION} PKGNAMESUFFIX= -community -DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3${PKGNAMESUFFIX} +DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= pavelivolkov@googlemail.com +MAINTAINER= pavelivolkov@gmail.com COMMENT= Cisco 1700/2600/3600/3700/7200 Simulator -LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf \ - uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid - LICENSE= GPLv2 +LIB_DEPENDS= libelf.so:${PORTSDIR}/devel/libelf \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid + CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]* -USE_GMAKE= yes +USES= gmake +USE_ZIP= yes MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= UNSTABLE +OPTIONS_DEFINE= DOCS UNSTABLE UNSTABLE_DESC= development code (x64 Mac) LDFLAGS+= -luuid -MAKE_ENV= \ - DYNAMIPS_CODE=${DYNAMIPS_CODE} \ +MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \ DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} -NO_STAGE= yes .include <bsd.port.pre.mk> -PLIST_FILES= bin/${PORTNAME} bin/nvram_export +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= * -.if !defined(NO_INSTALL_MANPAGES) -MAN1= ${PORTNAME}.1 nvram_export.1 -MAN7= hypervisor_mode.7 -.endif .if ${PORT_OPTIONS:MUNSTABLE} DYNAMIPS_CODE= "unstable" @@ -47,32 +45,39 @@ DYNAMIPS_CODE= "unstable" DYNAMIPS_CODE= "stable" .endif +DYNAMIPS_ARCH= "nojit" + .if ${ARCH} == "i386" DYNAMIPS_ARCH= "x86" -.elif ${ARCH} == "amd64" +.elif ${ARCH} == "amd64" || ${ARCH} == "x86_64" DYNAMIPS_ARCH= "amd64" -.elif ${ARCH} == "sparc64" -BROKEN= Does not compile -.elif ${ARCH} == "powerpc" +.elif ${ARCH} == "powerpc" && ${DYNAMIPS_CODE} == "unstable" DYNAMIPS_ARCH= "ppc32" -BROKEN= Does not compile: uses i386 asm -.else +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 DYNAMIPS_ARCH= "nojit" .endif +#BROKEN_ia64= does not compile: invokes i386 assembler +#BROKEN_sparc64= ${BROKEN_ia64} +#BROKEN_powerpc= ${BROKEN_ia64} + +.include <bsd.port.options.mk> + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${PREFIX}/bin/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.${DYNAMIPS_CODE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${DYNAMIPS_CODE}/nvram_export ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7 + +post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.community ${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 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/RELEASE-NOTES ${STAGEDIR}${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/dynamips-community/distinfo ============================================================================== --- head/emulators/dynamips-community/distinfo Sat Jan 25 16:18:54 2014 (r341047) +++ head/emulators/dynamips-community/distinfo Sat Jan 25 16:29:42 2014 (r341048) @@ -1,2 +1,2 @@ -SHA256 (dynamips-0.2.8-RC3-community.tar.gz) = e808a50b6b9d24a90604885f90699f46b26a49e6ce9cf542aa288f135b2508ac -SIZE (dynamips-0.2.8-RC3-community.tar.gz) = 818199 +SHA256 (dynamips-0.2.10-source.zip) = d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44 +SIZE (dynamips-0.2.10-source.zip) = 966018 Modified: head/emulators/dynamips-community/pkg-descr ============================================================================== --- head/emulators/dynamips-community/pkg-descr Sat Jan 25 16:18:54 2014 (r341047) +++ head/emulators/dynamips-community/pkg-descr Sat Jan 25 16:29:42 2014 (r341048) @@ -1,3 +1,3 @@ Cisco 1700/2600/3600/3700/7200 simulator. -WWW: http://www.gns3.net/content/dynamips-028-rc3-community-version-released +WWW: http://www.gns3.net/dynamips/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401251629.s0PGTgBG090264>