From owner-svn-ports-all@freebsd.org Wed Jan 24 20:58:22 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7094DEC5A77; Wed, 24 Jan 2018 20:58:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2073D77D6E; Wed, 24 Jan 2018 20:58:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16BAC22C7D; Wed, 24 Jan 2018 20:58:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0OKwLsZ058299; Wed, 24 Jan 2018 20:58:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0OKwLBv058296; Wed, 24 Jan 2018 20:58:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201801242058.w0OKwLBv058296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 24 Jan 2018 20:58:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459889 - in head/devel/cppunit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/devel/cppunit: . files X-SVN-Commit-Revision: 459889 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 20:58:22 -0000 Author: bdrewery Date: Wed Jan 24 20:58:21 2018 New Revision: 459889 URL: https://svnweb.freebsd.org/changeset/ports/459889 Log: - Provide a compatibility cppunit-config. Upstream intends scripts to use pkg-config now, but there are plenty of old cppunit.m4 files that expect to find cppunit-config still, including several ports. PR: 220162 Reported by: Greg V Added: head/devel/cppunit/files/cppunit-config.in (contents, props changed) Modified: head/devel/cppunit/Makefile head/devel/cppunit/pkg-plist Modified: head/devel/cppunit/Makefile ============================================================================== --- head/devel/cppunit/Makefile Wed Jan 24 20:50:26 2018 (r459888) +++ head/devel/cppunit/Makefile Wed Jan 24 20:58:21 2018 (r459889) @@ -2,7 +2,7 @@ PORTNAME= cppunit PORTVERSION= 1.14.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://dev-www.libreoffice.org/src/ @@ -23,6 +23,12 @@ INSTALL_TARGET= install-strip OPTIONS_SUB= yes USE_LDCONFIG= yes USES= libtool pathfix + +SUB_FILES= cppunit-config +SUB_LIST+= DISTVERSION=${DISTVERSION} + +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/cppunit-config ${STAGEDIR}${PREFIX}/bin/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/devel/cppunit/files/cppunit-config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cppunit/files/cppunit-config.in Wed Jan 24 20:58:21 2018 (r459889) @@ -0,0 +1,98 @@ +#!/bin/sh + +prefix=%%PREFIX%% +exec_prefix=%%PREFIX%% +exec_prefix_set=no +includedir=%%PREFIX%%/include + +usage() +{ + cat <&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo %%DISTVERSION%% + ;; + --help) + usage 0 + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + if test "$includedir" != "/usr/include" ; then + echo -I$includedir + fi +fi + +if test "$echo_libs" = "yes"; then + if test %%PREFIX%%/lib != /usr/lib ; then + my_linker_flags="-L%%PREFIX%%/lib" + fi + echo ${my_linker_flags} -lcppunit +fi + + + + Modified: head/devel/cppunit/pkg-plist ============================================================================== --- head/devel/cppunit/pkg-plist Wed Jan 24 20:50:26 2018 (r459888) +++ head/devel/cppunit/pkg-plist Wed Jan 24 20:58:21 2018 (r459889) @@ -1,3 +1,4 @@ +bin/cppunit-config bin/DllPlugInTester include/cppunit/AdditionalMessage.h include/cppunit/Asserter.h