Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Jun 9, 2015
1 parent 6f0d898 commit 62b8a98
Show file tree
Hide file tree
Showing 178 changed files with 5,634 additions and 4,361 deletions.
1 change: 1 addition & 0 deletions archivers/p5-Archive-Zip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ COMMENT= Create, manipulate, read, and write Zip archive files
LICENSE= ART10 GPLv1
LICENSE_COMB= dual

NO_ARCH= yes
USES= perl5
USE_PERL5= configure

Expand Down
3 changes: 2 additions & 1 deletion astro/p5-Astro-SpaceTrack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}

PORTSCOUT= limit:^[0-9\.]*$$

CONFIGURE_ARGS= -y
NO_ARCH= yes
USES= perl5
USE_PERL5= configure
CONFIGURE_ARGS= -y

.include <bsd.port.pre.mk>

Expand Down
3 changes: 2 additions & 1 deletion astro/p5-Astro-satpass/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= Astro-satpass
PORTVERSION= 0.068
PORTVERSION= 0.069
CATEGORIES= astro perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:WYANT
Expand All @@ -29,6 +29,7 @@ USGS_DESC= Add support for Geo::WebService::Elevation::USGS
PORTSCOUT= limit:^[0-9\.]*$$

CONFIGURE_ARGS= -y
NO_ARCH= yes
USES= perl5
USE_PERL5= configure

Expand Down
4 changes: 2 additions & 2 deletions astro/p5-Astro-satpass/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (Astro-satpass-0.068.tar.gz) = 4568d73f59904b8e245b8a26e41b99351b4e807399af62f42312b4f612ddd890
SIZE (Astro-satpass-0.068.tar.gz) = 522862
SHA256 (Astro-satpass-0.069.tar.gz) = 9985c134724105b3481fd37047fa6a282d201a84bb68e0a5c34606a2e9990203
SIZE (Astro-satpass-0.069.tar.gz) = 522980
4 changes: 0 additions & 4 deletions audio/liblscp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,4 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes

post-patch:
@${REINPLACE_CMD} -e \
's|"GNU strip"|"strip"|' ${WRKSRC}/configure

.include <bsd.port.mk>
9 changes: 0 additions & 9 deletions audio/mac/files/patch-configure
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11215,7 +11215,7 @@ striplib=
old_striplib=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | $EGREP "GNU|elftoolchain" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2 changes: 1 addition & 1 deletion comms/concordance/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COMMENT= Command-line Logitech Harmony configuration tool

LICENSE= GPLv2

LIB_DEPENDS= libconcord.so.${PORTVERSION}:${PORTSDIR}/comms/libconcord
LIB_DEPENDS= libconcord.so:${PORTSDIR}/comms/libconcord

USES= tar:bzip2
WRKSRC_SUBDIR= ${PORTNAME}
Expand Down
2 changes: 1 addition & 1 deletion comms/py-libconcord/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COMMENT= Python bindings for Logitech Harmony library

LICENSE= GPLv2

LIB_DEPENDS= libconcord.so.${PORTVERSION}:${PORTSDIR}/comms/libconcord
LIB_DEPENDS= libconcord.so:${PORTSDIR}/comms/libconcord

USE_LDCONFIG= yes
USES= python:2.7+ tar:bzip2
Expand Down
7 changes: 4 additions & 3 deletions databases/p5-Mojo-Pg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= Mojo-Pg
PORTVERSION= 2.05
PORTVERSION= 2.06
CATEGORIES= databases www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SRI
Expand All @@ -17,13 +17,14 @@ BUILD_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
p5-Mojolicious>=6.0:${PORTSDIR}/www/p5-Mojolicious
RUN_DEPENDS:= ${BUILD_DEPENDS}

OPTIONS_DEFINE= EXAMPLES

NO_ARCH= yes
USES= perl5
USE_PERL5= configure

PORTEXAMPLES= *

OPTIONS_DEFINE= EXAMPLES

post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
Expand Down
4 changes: 2 additions & 2 deletions databases/p5-Mojo-Pg/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (Mojo-Pg-2.05.tar.gz) = 8ebce6e7700b1ea8b9a17ae930ad2b91dc51ef5184d6fb21229948e970e26ef2
SIZE (Mojo-Pg-2.05.tar.gz) = 23254
SHA256 (Mojo-Pg-2.06.tar.gz) = 087b5d2eed73166609f4b7aac6d5015172f0cde3063987de8651d9b91b98d7ee
SIZE (Mojo-Pg-2.06.tar.gz) = 23364
1 change: 1 addition & 0 deletions devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1637,6 +1637,7 @@
SUBDIR += p5-Cairo-GObject
SUBDIR += p5-Calendar-Simple
SUBDIR += p5-Callback-Frame
SUBDIR += p5-Canary-Stability
SUBDIR += p5-Capture-Tiny
SUBDIR += p5-Carp
SUBDIR += p5-Carp-Always
Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= bisoncpp
PORTVERSION= 4.09.02
PORTVERSION= 4.10.01
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
DISTNAME= bisonc++_${PORTVERSION}.orig
Expand All @@ -20,7 +20,7 @@ PORTDOCS= *

WRKSRC= ${WRKDIR}/bisonc++-${PORTVERSION}

USE_GCC= yes
USE_GCC= 4.9+

USES= shebangfix

Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (bisonc++_4.09.02.orig.tar.gz) = b51f3ec125c6405530d82c403a58ec3c0c0a55242fb93ed6f4177aef59a2b380
SIZE (bisonc++_4.09.02.orig.tar.gz) = 654692
SHA256 (bisonc++_4.10.01.orig.tar.gz) = d03b1c3982f7cff9663382cb6933ccc5aa8ce35a7ccbd6f76769aa261777bf0b
SIZE (bisonc++_4.10.01.orig.tar.gz) = 652569
4 changes: 2 additions & 2 deletions devel/bisoncpp/files/patch-INSTALL.im
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- INSTALL.im.orig 2013-06-21 11:16:33.000000000 +0200
+++ INSTALL.im 2013-11-27 22:15:51.000000000 +0100
--- INSTALL.im.orig 2015-04-28 13:26:33 UTC
+++ INSTALL.im
@@ -15,7 +15,7 @@
#define LDFLAGS ""
// flags passed to the linker
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-block__atindex.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./block/atindex.cc.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./block/atindex.cc 2013-11-27 18:55:51.000000000 +0100
@@ -6,7 +6,7 @@
--- block/atindex.cc.orig 2013-06-23 18:13:49 UTC
+++ block/atindex.cc
@@ -6,7 +6,7 @@ void Block::atIndex(size_t lineNr, strin
d_atDollar.push_back(
AtDollar(
AtDollar::AT, length(), lineNr,
Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/files/patch-block__block.ih
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ./block/block.ih.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./block/block.ih 2013-11-27 18:54:50.000000000 +0100
--- block/block.ih.orig 2013-06-23 18:13:49 UTC
+++ block/block.ih
@@ -5,6 +5,8 @@
#include <iterator>
#include <limits>
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-block__dollarindex.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./block/dollarindex.cc.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./block/dollarindex.cc 2013-11-27 18:55:17.000000000 +0100
@@ -6,7 +6,7 @@
--- block/dollarindex.cc.orig 2013-06-23 18:13:49 UTC
+++ block/dollarindex.cc
@@ -6,7 +6,7 @@ void Block::dollarIndex(size_t lineNr, s
{
d_atDollar.push_back(
AtDollar(AtDollar::DOLLAR, length(), lineNr,
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-block__idindex.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./block/idindex.cc.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./block/idindex.cc 2013-11-27 18:54:04.000000000 +0100
@@ -8,7 +8,7 @@
--- block/idindex.cc.orig 2013-06-23 18:13:49 UTC
+++ block/idindex.cc
@@ -8,7 +8,7 @@ void Block::IDindex(size_t lineNr, strin
d_atDollar.push_back(
AtDollar(
AtDollar::DOLLAR, length(), lineNr,
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./build.orig 2013-11-27 18:04:34.000000000 +0100
+++ ./build 2013-11-27 18:04:34.000000000 +0100
@@ -40,7 +40,10 @@
--- build.orig 2015-05-25 15:47:08 UTC
+++ build
@@ -40,7 +40,10 @@ void main(int argc, list argv)
manpage();

if (option == "manual")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- documentation/manual/conditions/gpl.yo.orig 2007-03-22 21:29:15.000000000 +0100
+++ documentation/manual/conditions/gpl.yo 2009-03-05 16:07:39.000000000 +0100
--- documentation/manual/conditions/gpl.yo.orig 2012-02-08 19:53:51 UTC
+++ documentation/manual/conditions/gpl.yo
@@ -1,8 +1,2 @@
The text of the em(GNU General Public License) (GPL) is frequently found in
-files named tt(COPYING). On em(Debian) systems the GPL may be found in the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- documentation/manual/invoking/options.yo.orig 2012-04-29 13:59:49.000000000 +0200
+++ documentation/manual/invoking/options.yo 2012-12-02 13:00:49.000000000 +0100
@@ -179,7 +179,7 @@
--- documentation/manual/invoking/options.yo.orig 2015-04-28 13:26:33 UTC
+++ documentation/manual/invoking/options.yo
@@ -235,7 +235,7 @@ END)

it() loption(own-tokens) (soption(T))nl()
The tokens returned as well as the text matched when bic() reads
Expand Down
14 changes: 7 additions & 7 deletions devel/bisoncpp/files/patch-icmake-install
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- icmake/install.orig 2013-06-21 11:16:34.000000000 +0200
+++ icmake/install 2013-11-27 22:05:08.000000000 +0100
@@ -3,7 +3,6 @@
--- icmake/install.orig 2013-06-21 09:16:34 UTC
+++ icmake/install
@@ -3,7 +3,6 @@ string setWhere(string where, string def
if (where == "")
where = defaultWhere;

- md(where);
return where;
}

@@ -13,22 +12,15 @@
@@ -13,22 +12,15 @@ void install(string what, string where)

if (what == "program")
{
Expand All @@ -34,7 +34,7 @@
printf(" INSTALLING skeleton files at `" + where + "'\n");
md(where);
run("cp skeletons/* " + where);
@@ -37,8 +29,7 @@
@@ -37,8 +29,7 @@ void install(string what, string where)

if (what == "man")
{
Expand All @@ -44,7 +44,7 @@
printf(" INSTALLING the manual page at `", where, "'\n");
run("gzip -9 < tmp/man/" PROGRAM ".1 > " + where + "/" PROGRAM ".1.gz");
exit(0);
@@ -46,21 +37,18 @@
@@ -46,21 +37,18 @@ void install(string what, string where)

if (what == "manual")
{
Expand All @@ -70,7 +70,7 @@
printf(" INSTALLING the html-manual page at `", where, "\n");
run("cp tmp/manhtml/" PROGRAM "man.html " + where);
exit(0);
@@ -68,17 +56,14 @@
@@ -68,17 +56,14 @@ void install(string what, string where)

if (what == "extra")
{
Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/files/patch-icmake-manpage
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- icmake/manpage.orig 2013-06-21 11:16:34.000000000 +0200
+++ icmake/manpage 2013-11-27 17:42:34.000000000 +0100
--- icmake/manpage.orig 2013-06-21 09:16:34 UTC
+++ icmake/manpage
@@ -3,14 +3,29 @@

void manpage()
Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/files/patch-options__options.ih
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ./options/options.ih.orig 2013-06-21 11:16:34.000000000 +0200
+++ ./options/options.ih 2013-11-27 18:56:37.000000000 +0100
--- options/options.ih.orig 2013-06-21 09:16:34 UTC
+++ options/options.ih
@@ -4,6 +4,7 @@
#include <bobcat/arg>
#include <bobcat/string>
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-options__setbasicstrings.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./options/setbasicstrings.cc.orig 2013-06-24 15:10:12.000000000 +0200
+++ ./options/setbasicstrings.cc 2013-11-27 18:56:48.000000000 +0100
@@ -35,7 +35,7 @@
--- options/setbasicstrings.cc.orig 2014-02-17 12:30:08 UTC
+++ options/setbasicstrings.cc
@@ -34,7 +34,7 @@ void Options::setBasicStrings()

string nTokens;
if (d_arg.option(&nTokens, "required-tokens"))
Expand Down
8 changes: 4 additions & 4 deletions devel/bisoncpp/files/patch-scanner__lex.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
--- scanner/lex.cc.orig 2014-04-04 14:46:17.624123806 +0600
+++ scanner/lex.cc 2014-04-04 14:46:39.301107135 +0600
@@ -2702,7 +2702,7 @@
--- scanner/lex.cc.orig 2015-05-17 14:35:38 UTC
+++ scanner/lex.cc
@@ -2698,7 +2698,7 @@ try
{
#line 193 "lexer"
#line 194 "lexer"
{
- d_number = stoul(d_matched);
+ d_number = A2x(d_matched);
Expand Down
4 changes: 2 additions & 2 deletions devel/bisoncpp/files/patch-scanner__scanner.ih
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ./scanner/scanner.ih.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./scanner/scanner.ih 2013-11-27 19:03:53.000000000 +0100
--- scanner/scanner.ih.orig 2013-06-23 18:13:49 UTC
+++ scanner/scanner.ih
@@ -14,6 +14,7 @@
#include <bobcat/arg>
#include <bobcat/mstream>
Expand Down
6 changes: 3 additions & 3 deletions devel/bisoncpp/files/patch-scanner__scanner1.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- ./scanner/scanner1.cc.orig 2013-06-23 20:13:49.000000000 +0200
+++ ./scanner/scanner1.cc 2013-11-27 19:03:33.000000000 +0100
@@ -15,7 +15,7 @@
--- scanner/scanner1.cc.orig 2013-06-23 18:13:49 UTC
+++ scanner/scanner1.cc
@@ -15,7 +15,7 @@ Scanner::Scanner(std::string const &infi

string value;
if (arg.option(&value, "max-inclusion-depth"))
Expand Down
4 changes: 3 additions & 1 deletion devel/hgsvn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= hgsvn
PORTVERSION= 0.2.5
PORTVERSION= 0.3.9
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand All @@ -19,4 +19,6 @@ USES= python zip
USE_PYTHON= distutils autoplist
PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}

NO_ARCH= YES

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions devel/hgsvn/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (hgsvn-0.2.5.zip) = 513a325559203a23e595a3c5270ee34aef39fcc337dfc379596a375ccaa59deb
SIZE (hgsvn-0.2.5.zip) = 200945
SHA256 (hgsvn-0.3.9.zip) = 9a1873f09d087fce5f5da22d939c78dd58dd3ff6491d8c607ed66b374d8e6ca1
SIZE (hgsvn-0.3.9.zip) = 98298
2 changes: 1 addition & 1 deletion devel/libuv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= libuv
PORTVERSION= 1.5.0
PORTVERSION= 1.6.1
CATEGORIES= devel
MASTER_SITES= http://libuv.org/dist/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
Expand Down
4 changes: 2 additions & 2 deletions devel/libuv/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (libuv-v1.5.0.tar.gz) = 9cc067435b0ce3aec0194e4f519939cfa4eb823d14dd38dbec014cd048cb817c
SIZE (libuv-v1.5.0.tar.gz) = 1018364
SHA256 (libuv-v1.6.1.tar.gz) = 1a0b8030bc45a2c7b7cf44a89837bb43cf9e4484d8eb94652877f6dfdffc2a5f
SIZE (libuv-v1.6.1.tar.gz) = 1021494
7 changes: 6 additions & 1 deletion devel/p5-B-Hooks-Parser/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= B-Hooks-Parser
PORTVERSION= 0.12
PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
Expand All @@ -20,4 +20,9 @@ TEST_DEPENDS= p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScop
USES= perl5
USE_PERL5= configure

post-install:
${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/B/Hooks/Parser/Parser.so
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/B/Hooks/Parser/Parser.so
${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/B/Hooks/Parser/Parser.so

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions devel/p5-B-Hooks-Parser/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SHA256 (B-Hooks-Parser-0.12.tar.gz) = cddbc1e664975ef1e35b5f9361ff993d9005507201463f9e5561a056ffbadb25
SIZE (B-Hooks-Parser-0.12.tar.gz) = 72662
SHA256 (B-Hooks-Parser-0.13.tar.gz) = f6c838e59f52e21ccc0b2c9d85d6f7ba33119098ad3a261698b01690c2619646
SIZE (B-Hooks-Parser-0.13.tar.gz) = 83951
3 changes: 1 addition & 2 deletions devel/p5-B-Hooks-Parser/pkg-plist
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
%%PERL5_MAN3%%/B::Hooks::Parser.3.gz
%%SITE_ARCH%%/B/Hooks/Parser.pm
%%SITE_ARCH%%/B/Hooks/Parser/Install/Files.pm
%%SITE_ARCH%%/B/Hooks/Parser/Install/hook_parser.h
%%SITE_ARCH%%/auto/B/Hooks/Parser/Parser.so
%%PERL5_MAN3%%/B::Hooks::Parser.3.gz
Loading

0 comments on commit 62b8a98

Please sign in to comment.