Date: Mon, 21 May 2018 09:04:12 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470523 - in head/devel/dub: . files Message-ID: <201805210904.w4L94CYE038292@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon May 21 09:04:11 2018 New Revision: 470523 URL: https://svnweb.freebsd.org/changeset/ports/470523 Log: - Add LICENSE - Don't install LICENSE as data - Don't call git from the build process, making it more consistent and reproducible Approved by: portmgr blanket Modified: head/devel/dub/Makefile head/devel/dub/files/patch-build.sh Modified: head/devel/dub/Makefile ============================================================================== --- head/devel/dub/Makefile Mon May 21 08:48:48 2018 (r470522) +++ head/devel/dub/Makefile Mon May 21 09:04:11 2018 (r470523) @@ -8,26 +8,24 @@ CATEGORIES= devel MAINTAINER= acm@FreeBSD.org COMMENT= Package and build manager for D applications and libraries +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + BUILD_DEPENDS= ldmd2:lang/ldc LIB_DEPENDS= libcurl.so:ftp/curl -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - USE_GITHUB= yes GH_ACCOUNT= dlang -PLIST_FILES= bin/${PORTNAME} \ - ${DATADIR}/LICENSE +PLIST_FILES= bin/${PORTNAME} post-patch: - ${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/source/dub/version_.d + @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/source/dub/version_.d do-build: @cd ${WRKSRC} && ${SH} build.sh do-install: - @${MKDIR} ${STAGEDIR}/${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DATADIR}/LICENSE .include <bsd.port.mk> Modified: head/devel/dub/files/patch-build.sh ============================================================================== --- head/devel/dub/files/patch-build.sh Mon May 21 08:48:48 2018 (r470522) +++ head/devel/dub/files/patch-build.sh Mon May 21 09:04:11 2018 (r470523) @@ -1,12 +1,22 @@ ---- build.sh.orig 2017-12-13 09:54:28.459920000 -0500 -+++ build.sh 2017-12-13 09:55:25.463123000 -0500 +--- build.sh.orig 2018-01-21 22:30:48 UTC ++++ build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -e if [ "$DMD" = "" ]; then -@@ -56,7 +56,7 @@ +@@ -41,9 +41,6 @@ if [[ $VERSION < 2.069.0 ]]; then + LIBS=`echo "$LIBS" | sed 's/^-L/-L-L/; s/ -L/ -L-L/g; s/^-l/-L-l/; s/ -l/ -L-l/g'` + fi + +-if [ "$GITVER" = "" ]; then +- GITVER=$(git describe) || echo "Could not determine a version with git." +-fi + if [ "$GITVER" != "" ]; then + echo Generating version file... + echo "module dub.version_;" > source/dub/version_.d +@@ -56,7 +53,7 @@ fi MACOSX_DEPLOYMENT_TARGET=10.7 echo Running $DMD...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805210904.w4L94CYE038292>