commit 9cff048e884dc926990dcc569352f290672310ce parent e299125fe49d8cbb0dfcb96ada75566c96d6781c Author: Kyle Milz <kyle@0x30.net> Date: Fri, 5 Aug 2016 19:45:50 -0600 bin/pkg: don't use custom PORTPATH Diffstat:
7 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/bin/openbsd/devel/ccitrunrun/Makefile b/bin/openbsd/ccitrunrun/Makefile diff --git a/bin/openbsd/devel/ccitrunrun/pkg/DESCR b/bin/openbsd/ccitrunrun/pkg/DESCR diff --git a/bin/openbsd/devel/ccitrunrun/pkg/PLIST b/bin/openbsd/ccitrunrun/pkg/PLIST diff --git a/bin/openbsd/devel/citrun/Makefile b/bin/openbsd/citrun/Makefile diff --git a/bin/openbsd/devel/citrun/pkg/DESCR b/bin/openbsd/citrun/pkg/DESCR diff --git a/bin/openbsd/devel/citrun/pkg/PLIST b/bin/openbsd/citrun/pkg/PLIST diff --git a/bin/pkg.sh b/bin/pkg.sh @@ -1,45 +1,37 @@ #!/bin/sh -e -# Single point of entry for building packages on all platforms. -# -[ "${1}" != "citrun" -a "${1}" != "ccitrunrun" ] && exit 2 - -portname="${1}" uname=`uname` - if [ "$uname" = "OpenBSD" ]; then - pkg_path=/usr/ports/packages/`uname -m`/all/${portname}-*.tgz + pkg_path=/usr/ports/packages/`uname -m`/all/citrun-*.tgz # Make sure package building doesn't rely on anything that's already installed - doas pkg_delete $portname || true + doas pkg_delete citrun || true rm -f $pkg_path - # Don't check checksums as this script is used for continuous integration - export PORTSDIR_PATH="`pwd`/bin/openbsd:/usr/ports" - export NO_CHECKSUM=1 + rm -rf /usr/ports/devel/citrun + cp -R bin/openbsd/citrun /usr/ports/devel/ - # Always re-fetch the latest sources - rm -f /usr/ports/distfiles/${portname}-*.tar.gz + export NO_CHECKSUM=1 + rm -f /usr/ports/distfiles/citrun-*.tar.gz - # The 'test' target will do a full build first - make -C bin/openbsd/devel/$portname clean=all - make -C bin/openbsd/devel/$portname build - make -C bin/openbsd/devel/$portname package + make -C /usr/ports/devel/citrun clean=all + make -C /usr/ports/devel/citrun build + make -C /usr/ports/devel/citrun package doas pkg_add -Dunsigned -r $pkg_path mv $pkg_path bin/ elif [ "$uname" = "Darwin" ]; then - sudo port uninstall $portname + sudo port uninstall citrun sudo port -v -D darwin/devel/citrun clean sudo port -v -D darwin/devel/citrun build sudo port -v -D darwin/devel/citrun install - cp /opt/local/var/macports/software/citrun/citrun-0.0_0.darwin_15.x86_64.tbz2 . + cp /opt/local/var/macports/software/citrun/citrun-0.0_0.darwin_15.x86_64.tbz2 bin/ elif [ "$uname" = "Linux" ]; then - sudo dpkg -r $portname || true + sudo dpkg -r citrun || true tmpdir=`mktemp -d` trap "rm -rf $tmpdir" EXIT