From owner-svn-ports-head@freebsd.org Mon Jun 29 23:24:04 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC5D8358130; Mon, 29 Jun 2020 23:24:04 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wk8N5VrGz4b5D; Mon, 29 Jun 2020 23:24:04 +0000 (UTC) (envelope-from jpaetzel@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 A01D9F51D; Mon, 29 Jun 2020 23:24:04 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05TNO4u1003237; Mon, 29 Jun 2020 23:24:04 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05TNO3rA003234; Mon, 29 Jun 2020 23:24:03 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <202006292324.05TNO3rA003234@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Mon, 29 Jun 2020 23:24:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540843 - in head/devel/popt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/devel/popt: . files X-SVN-Commit-Revision: 540843 X-SVN-Commit-Repository: ports 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.33 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: Mon, 29 Jun 2020 23:24:05 -0000 Author: jpaetzel Date: Mon Jun 29 23:24:03 2020 New Revision: 540843 URL: https://svnweb.freebsd.org/changeset/ports/540843 Log: Update popt to 1.18 https://lwn.net/Articles/824267/ TL;DR popt upstream has been rebooted 1.18 is essentially a no-op update that will allow developiment to be restarted. PR: 247529 Submitted by: daniel.engberg.lists@pyret.net Added: head/devel/popt/files/patch-tests_testit.sh (contents, props changed) Deleted: head/devel/popt/files/patch-Makefile.in head/devel/popt/files/patch-popt.c Modified: head/devel/popt/Makefile head/devel/popt/distinfo head/devel/popt/pkg-plist Modified: head/devel/popt/Makefile ============================================================================== --- head/devel/popt/Makefile Mon Jun 29 23:15:26 2020 (r540842) +++ head/devel/popt/Makefile Mon Jun 29 23:24:03 2020 (r540843) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= popt -PORTVERSION= 1.16 -PORTREVISION= 2 +PORTVERSION= 1.18 CATEGORIES= devel -MASTER_SITES= http://ftp.rpm.org/mirror/popt/ \ - GENTOO +MASTER_SITES= http://ftp.rpm.org/popt/releases/popt-1.x/ MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Getopt(3) like library with a number of enhancements, from Redhat LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING +USES= iconv libtool pathfix + +TEST_TARGET= check + OPTIONS_DEFINE= NLS GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= iconv libtool pathfix USE_LDCONFIG= yes NLS_CONFIGURE_ENABLE= nls Modified: head/devel/popt/distinfo ============================================================================== --- head/devel/popt/distinfo Mon Jun 29 23:15:26 2020 (r540842) +++ head/devel/popt/distinfo Mon Jun 29 23:24:03 2020 (r540843) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579345838 -SHA256 (popt-1.16.tar.gz) = e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 -SIZE (popt-1.16.tar.gz) = 702769 +TIMESTAMP = 1593027760 +SHA256 (popt-1.18.tar.gz) = 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 +SIZE (popt-1.18.tar.gz) = 580569 Added: head/devel/popt/files/patch-tests_testit.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/popt/files/patch-tests_testit.sh Mon Jun 29 23:24:03 2020 (r540843) @@ -0,0 +1,66 @@ +--- tests/testit.sh.orig 2020-06-24 22:53:32 UTC ++++ tests/testit.sh +@@ -114,63 +114,6 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0x + + run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar + +-run test1 "test1 - 58" "\ +-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] +- [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] +- [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] +- [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] +- [--randint=INT] [--randshort=SHORT] [--randlong=LONG] +- [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr] +- [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] +- [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage +-run test1 "test1 - 59" "\ +-Usage: lt-test1 [OPTION...] +- --arg1 First argument with a really long +- description. After all, we have to test +- argument help wrapping somehow, right? +- -2, --arg2=ARG Another argument (default: \"(none)\") +- -3, --arg3=ANARG A third argument +- -onedash POPT_ARGFLAG_ONEDASH: Option takes a single - +- --optional[=STRING] POPT_ARGFLAG_OPTIONAL: Takes an optional +- string argument +- --val POPT_ARG_VAL: 125992 141421 +- -i, --int=INT POPT_ARG_INT: 271828 (default: 271828) +- -s, --short=SHORT POPT_ARG_SHORT: 4523 (default: 4523) +- -l, --long=LONG POPT_ARG_LONG: 738905609 (default: 738905609) +- -L, --longlong=LONGLONG POPT_ARG_LONGLONG: 738905609 (default: +- 738905609) +- -f, --float=FLOAT POPT_ARG_FLOAT: 3.14159 (default: 3.14159) +- -d, --double=DOUBLE POPT_ARG_DOUBLE: 9.8696 (default: 9.8696) +- --randint=INT POPT_ARGFLAG_RANDOM: experimental +- --randshort=SHORT POPT_ARGFLAG_RANDOM: experimental +- --randlong=LONG POPT_ARGFLAG_RANDOM: experimental +- --randlonglong=LONGLONG POPT_ARGFLAG_RANDOM: experimental +- --argv STRING POPT_ARG_ARGV: append string to argv array +- (can be used multiple times) +- --[no]bitset POPT_BIT_SET: |= 0x7777 +- --[no]bitclr POPT_BIT_CLR: &= ~0xf842 +- --bitxor POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed) +- --nstr=STRING POPT_ARG_STRING: (null) (default: null) +- --lstr=STRING POPT_ARG_STRING: \"123456789...\" (default: +- \"This tests default strings and exceeds the +- ... limit. +- 123456789+123456789+123456789+123456789+123456789+ 123456789+123456789+123456789+123456789+123456789+ 1234567...\") +- +-arg for cb2 +- -c, --cb2=STRING Test argument callbacks +- -I, --inc An included argument +- +-Callback arguments +- -c, --cb=STRING Test argument callbacks +- --longopt Unused option for help testing +- +-Options implemented via popt alias/exec: +- --simple=ARG simple description +- +-Help options: +- -?, --help Show this help message +- --usage Display brief usage message" --help +- + #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer + #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer + #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer Modified: head/devel/popt/pkg-plist ============================================================================== --- head/devel/popt/pkg-plist Mon Jun 29 23:15:26 2020 (r540842) +++ head/devel/popt/pkg-plist Mon Jun 29 23:24:03 2020 (r540843) @@ -2,7 +2,7 @@ include/popt.h lib/libpopt.a lib/libpopt.so lib/libpopt.so.0 -lib/libpopt.so.0.0.0 +lib/libpopt.so.0.0.1 libdata/pkgconfig/popt.pc man/man3/popt.3.gz %%NLS%%share/locale/cs/LC_MESSAGES/popt.mo