From 9103c3deacc4f33aa560a088047215d354883b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 9 Mar 2017 00:11:29 +0100 Subject: [PATCH 1/2] Replace the old mkpkgng script with a true port Makefile. --- configure.ac | 2 +- freebsd/.gitignore | 2 + freebsd/Makefile.in | 37 +++++++++ mkpkgng.in | 178 -------------------------------------------- 4 files changed, 40 insertions(+), 179 deletions(-) create mode 100644 freebsd/.gitignore create mode 100644 freebsd/Makefile.in delete mode 100644 mkpkgng.in diff --git a/configure.ac b/configure.ac index b026be9..6256a45 100644 --- a/configure.ac +++ b/configure.ac @@ -322,8 +322,8 @@ AC_CONFIG_FILES([ lib/test/Makefile lib/test/cryb-test.pc t/Makefile + freebsd/Makefile ]) -AC_CONFIG_FILES([mkpkgng], [chmod +x mkpkgng]) AC_CONFIG_FILES([tools/coverage.sh], [chmod +x tools/coverage.sh]) AC_OUTPUT diff --git a/freebsd/.gitignore b/freebsd/.gitignore new file mode 100644 index 0000000..438ddd4 --- /dev/null +++ b/freebsd/.gitignore @@ -0,0 +1,2 @@ +!/Makefile.in +/work diff --git a/freebsd/Makefile.in b/freebsd/Makefile.in new file mode 100644 index 0000000..4712f29 --- /dev/null +++ b/freebsd/Makefile.in @@ -0,0 +1,37 @@ +# $FreeBSD: portlint$ + +PORTNAME= @PACKAGE_TARNAME@ +PORTVERSION= @PACKAGE_VERSION@ +CATEGORIES= security devel +MASTER_SITES= # +DISTFILES= # + +MAINTAINER= @PACKAGE_BUGREPORT@ +COMMENT= Collection of cryptographic and security-related libraries + +LICENSE= BSD3CLAUSE + +USE_LDCONFIG= yes +USES= gmake libtool pkgconfig + +NO_WRKSUBDIR= yes + +DESCR= ${WRKDIR}/pkg-descr + +do-extract: + (${CAT} @top_srcdir@/README && ${ECHO} && \ + ${ECHO} "WWW: @PACKAGE_URL@") >${DESCR} + +do-build: + (cd @top_srcdir@ && \ + ${GMAKE} all) + +do-install: + (cd @top_srcdir@ && \ + ${GMAKE} install-strip DESTDIR=${STAGEDIR} PREFIX=${PREFIX}) + +post-stage: + (cd ${STAGEDIR} && \ + find -s . -type f -or -type l | cut -c 2-) >>${TMPPLIST} + +.include diff --git a/mkpkgng.in b/mkpkgng.in deleted file mode 100644 index 3918166..0000000 --- a/mkpkgng.in +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -#- -# Copyright (c) 2013-2017 Dag-Erling Smørgrav -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -# Print an informational message -info() { - echo "mkpkgng: $@" -} - -# Print an error message and exit -error() { - echo "mkpkgng: $@" 1>&2 - exit 1 -} - -# Ask a yes / no question -yesno() { - while :; do - echo -n "mkpkgng: $@ (yes/no) " - read answer - case $answer in - [Yy]|[Yy][Ee][Ss]) - return 0 - ;; - [Nn]|[Nn][Oo]) - return 1 - ;; - esac - done -} - -# -# Locate source and build directory -# -srcdir="@abs_top_srcdir@" -builddir="@abs_top_builddir@" -cd "$srcdir" - -# -# Determine pkgng version and ABI -# -pkgver=$(pkg -v) -[ -n "$pkgver" ] || error "Unable to determine pkgng version." -pkgabi=$(pkg config abi) -[ -n "$pkgabi" ] || error "Unable to determine package ABI." - -# -# Determine package name and version -# -package="@PACKAGE@" -version="@PACKAGE_VERSION@" -if ! expr "$version" : '^[0-9]\{1,\}\(\.[0-9]\{1,\}\)*$' >/dev/null ; then - svnversion="$(svnversion 2>&1)" - svnversion=$(expr "$svnversion" : '^\([0-9][0-9]*\)[A-Z]\{0,1\}$') - if [ -n "$svnversion" ] ; then - package="$package-$version" - version="r$svnversion" - else - package="$package-$version" - version="$(date '+%Y%m%d')" - fi -fi - -# -# Locate GNU make -# -if which gmake >/dev/null ; then - make=gmake -else - make=make -fi -make="$make --no-print-directory --quiet V=0" - -# -# Create temporary directory -# -info "Creating the temporary directory." -tmproot=$(mktemp -d "${builddir}/$package-$version.XXXXXX") -[ -n "$tmproot" -a -d "$tmproot" ] || \ - error "Unable to create the temporary directory." -trap "exit 1" INT -trap "info Deleting the temporary directory. ; rm -rf '$tmproot'" EXIT -set -e - -# -# Install into tmproot -# -info "Installing into the temporary directory." -$make install DESTDIR="$tmproot" - -# -# Compress man pages -# -find $tmproot -type d -name 'man[0-9]' | -while read mandir ; do - find $mandir -type f -name '*.[0-9]' | - while read manpage ; do - gzip "$manpage" - done - find $mandir -type l -name '*.[0-9]' | - while read manlink ; do - ln -s "$(readlink $manlink).gz" "$manlink.gz" - done -done - -# -# Generate stub manifest -# -info "Generating the stub manifest." -manifest="$tmproot/+MANIFEST" -cat >"$manifest" <>"$manifest" - -# -# Create the package -# -info "Creating the package." -pkg create -r "$tmproot" -m "$tmproot" -o "$builddir" - -# -# Done -# -info "Package created for $package-$version." From cddb124bc6f906d13cc19e9bc9eb2aa791ff6e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 22 Mar 2017 20:57:28 +0100 Subject: [PATCH 2/2] Use the correct variable for find(1). --- freebsd/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freebsd/Makefile.in b/freebsd/Makefile.in index 4712f29..4f2d397 100644 --- a/freebsd/Makefile.in +++ b/freebsd/Makefile.in @@ -32,6 +32,6 @@ do-install: post-stage: (cd ${STAGEDIR} && \ - find -s . -type f -or -type l | cut -c 2-) >>${TMPPLIST} + ${FIND} -s . -type f -or -type l | cut -c 2-) >>${TMPPLIST} .include