From owner-svn-ports-head@freebsd.org Wed Jan 11 01:13:53 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B4DFCA71E9; Wed, 11 Jan 2017 01:13:53 +0000 (UTC) (envelope-from jhale@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 mx1.freebsd.org (Postfix) with ESMTPS id 1B4211EBC; Wed, 11 Jan 2017 01:13:53 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B1DqCo085482; Wed, 11 Jan 2017 01:13:52 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B1Dqak085479; Wed, 11 Jan 2017 01:13:52 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201701110113.v0B1Dqak085479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Wed, 11 Jan 2017 01:13:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431149 - in head/finance/ktoblzcheck: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 01:13:53 -0000 Author: jhale Date: Wed Jan 11 01:13:51 2017 New Revision: 431149 URL: https://svnweb.freebsd.org/changeset/ports/431149 Log: - Fix LICENSE - Install DOCS - Add TEST_TARGET to run checks - Make the bankdata update script use fetch(1) instead of wget and retrieve the bankdata via https - Notify users that the included bankdata is outdated and it needs to be updated manually Added: head/finance/ktoblzcheck/files/ head/finance/ktoblzcheck/files/patch-src_bankdata_online__update.pl.in (contents, props changed) head/finance/ktoblzcheck/files/pkg-deinstall.in (contents, props changed) head/finance/ktoblzcheck/files/pkg-message.in (contents, props changed) Modified: head/finance/ktoblzcheck/Makefile Modified: head/finance/ktoblzcheck/Makefile ============================================================================== --- head/finance/ktoblzcheck/Makefile Wed Jan 11 00:48:04 2017 (r431148) +++ head/finance/ktoblzcheck/Makefile Wed Jan 11 01:13:51 2017 (r431149) @@ -3,28 +3,38 @@ PORTNAME= ktoblzcheck PORTVERSION= 1.48 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance german MASTER_SITES= SF/${PORTNAME} MAINTAINER= jhale@FreeBSD.org COMMENT= Check bank codes of German banks -LICENSE= LGPL21 +LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING USES= libtool pathfix perl5 GNU_CONFIGURE= yes USE_LDCONFIG= yes +CONFIGURE_ARGS= --with-wget=${FETCH_BINARY} INSTALL_TARGET= install-strip -OPTIONS_DEFINE= PYTHON +SUB_FILES= pkg-deinstall pkg-message +PORTDOCS= README + +OPTIONS_DEFINE= DOCS PYTHON OPTIONS_SUB= yes PYTHON_USES= python:2 PYTHON_CONFIGURE_ENABLE= python +TEST_TARGET= check + post-patch: @${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/src/lib/Makefile.in +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include Added: head/finance/ktoblzcheck/files/patch-src_bankdata_online__update.pl.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/ktoblzcheck/files/patch-src_bankdata_online__update.pl.in Wed Jan 11 01:13:51 2017 (r431149) @@ -0,0 +1,43 @@ +- Use fetch(1) instead of requiring wget or lynx +- Download over a secure connection + +--- src/bankdata/online_update.pl.in.orig 2012-10-01 21:03:49 UTC ++++ src/bankdata/online_update.pl.in +@@ -21,8 +21,8 @@ $pkgdatadir="$datadir/@PACKAGE@"; + $BANKDATADIR="@BANKDATA_PATH@"; + + ## Sanity checks +-die "Neither wget nor lynx is available on your system, or was available on the system where the installed rpm was built. This tool requires wget or lynx. If you have it i +-nstalled, then edit the script and set the variable WGET or LYNX to the full path to wget or lynx. Aborting for now." ++die "Neither fetch nor lynx is available on your system, or was available on the system where the installed package was built. This tool requires fetch or lynx. If you have it i ++nstalled, then edit the script and set the variable WGET or LYNX to the full path to fetch or lynx. Aborting for now." + if $WGET eq "NO" and $LYNX eq "NO"; + #die "sed or grep is not available on your system. This tool requires it. Aborting." + # if $SED eq "NO" || $GREP eq "NO"; +@@ -35,13 +35,13 @@ die "The directory for the bankdata \"$B + + ## Common constants + $debug=0; # set this to nonzero for activating debugging mode +-$BASE_URL="http://www.bundesbank.de"; ++$BASE_URL="https://www.bundesbank.de"; + $MAIN_URL="$BASE_URL"; + $MAIN_DOC="$MAIN_URL/Redaktion/DE/Standardartikel/Kerngeschaeftsfelder/Unbarer_Zahlungsverkehr/bankleitzahlen_download.html"; + + if ($debug == 0) { + if ($WGET ne "NO") { +- $DOWNLOADCMD = "$WGET -O - $MAIN_DOC"; ++ $DOWNLOADCMD = "$WGET -q -o - $MAIN_DOC"; + } else { + $DOWNLOADCMD = "$LYNX -source $MAIN_DOC"; + } +@@ -145,8 +145,8 @@ if ($debug == 0) { + ## + ## 1. Download + if ($WGET ne "NO") { +- print "$ECHO $WGET -O $install_1 $download\n"; +- system("$ECHO $WGET -O $install_1 $download"); ++ print "$ECHO $WGET -q -o $install_1 $download\n"; ++ system("$ECHO $WGET -q -o $install_1 $download"); + } else { + print "$ECHO $LYNX -source $download $gt $install_1\n"; + system("$ECHO $LYNX -source $download $gt $install_1");# || die "can't call system: $!"; Added: head/finance/ktoblzcheck/files/pkg-deinstall.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/ktoblzcheck/files/pkg-deinstall.in Wed Jan 11 01:13:51 2017 (r431149) @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ "${2}" = "POST-DEINSTALL" ]; then + if [ -d %%DATADIR%% ]; then + echo "" + echo "--------------------------------------------------------------------" + echo "To completely remove the port, you may need to remove" + echo "the following directories and the content manually:" + echo "" + echo " %%DATADIR%%" + echo "--------------------------------------------------------------------" + echo "" + fi +fi Added: head/finance/ktoblzcheck/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/ktoblzcheck/files/pkg-message.in Wed Jan 11 01:13:51 2017 (r431149) @@ -0,0 +1,13 @@ +-------------------------------------------------------------------- +The bankdata included with the ktoblzcheck distribution is outdated. +You should update this bankdata upon installation and periodically +afterwards. New bankdata is typically available every three months. + +To update the bankdata, run (as root): + +# %%DATADIR%%/online_update.pl + +The script is interactive and will present you with the bankdata +available for download. Follow the prompts and it will write the +new bankdata to %%DATADIR%%. +--------------------------------------------------------------------