summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <richard>2014-09-10 10:14:07 +0000
committerrichard <richard>2014-09-10 10:14:07 +0000
commit95c24d1d93846f644ee1ed43b1e6cf921612be69 (patch)
tree840e30c2264db0b7bf1933e5ab743f6e3f16f35d
parent0d119b140a70b48cd26602e93df0f74ade54ce5b (diff)
downloadpkgsrc-95c24d1d93846f644ee1ed43b1e6cf921612be69.tar.gz
adding devel/py-hgnested
hgnested is a Mercurial extension to work with nested repositories. It was inspired by the forest extension. The extension allows to apply common Mercurial commands to all the nested repositories at once like pull, push etc. It also allows to fetch a complete tree of repositories through ssh or http. To enable the "hgnested" extension, create an entry for it in your hgrc, like this: [extensions] hgnested = See `hg help hgnested` for the complete list of commands. For more information please visit the following website: http://code.google.com/p/hgnested/
-rw-r--r--devel/Makefile3
-rw-r--r--devel/binutils/builtin.mk34
-rw-r--r--devel/gmp/Makefile5
-rw-r--r--devel/libtool/distinfo6
-rw-r--r--devel/libtool/patches/manual-libtool.m46
-rw-r--r--devel/libtool/patches/patch-ab6
-rw-r--r--devel/libtool/patches/patch-ac52
-rw-r--r--devel/m4/hacks.mk5
-rw-r--r--devel/py-hgnested/DESCR9
-rw-r--r--devel/py-hgnested/MESSAGE23
-rw-r--r--devel/py-hgnested/Makefile18
-rw-r--r--devel/py-hgnested/PLIST9
-rw-r--r--devel/py-hgnested/distinfo5
-rw-r--r--devel/py-tryton/Makefile4
-rw-r--r--devel/py-tryton/distinfo8
-rw-r--r--devel/zlib/Makefile5
16 files changed, 157 insertions, 41 deletions
diff --git a/devel/Makefile b/devel/Makefile
index c0752813a0a..dad6dbb99d9 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1975 2014/09/08 11:30:16 wiz Exp $
+# $NetBSD: Makefile,v 1.1976 2014/09/10 10:14:07 richard Exp $
#
COMMENT= Development utilities
@@ -1542,6 +1542,7 @@ SUBDIR+= py-gobject3
SUBDIR+= py-gobject3-common
SUBDIR+= py-greenlet
SUBDIR+= py-h5py
+SUBDIR+= py-hgnested
SUBDIR+= py-hgtools
SUBDIR+= py-hgview
SUBDIR+= py-idle
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index 2367d9f06af..6ed27b822c6 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,10 +1,13 @@
-# $NetBSD: builtin.mk,v 1.6 2007/08/13 12:55:22 rillig Exp $
+# $NetBSD: builtin.mk,v 1.7 2014/09/10 10:14:07 richard Exp $
BINUTILS_PREFIX?= /usr
BUILTIN_PKG:= binutils
+
BUILTIN_FIND_FILES_VAR := BINUTILS_FILES
-BUILTIN_FIND_FILES.BINUTILS_FILES := ${BINUTILS_PREFIX}/include/bfd.h
+BUILTIN_FIND_FILES.BINUTILS_FILES := ${BINUTILS_PREFIX}/include/bfd.h \
+ ${BINUTILS_PREFIX}/gnu/include/bfd.h
+
.include "../../mk/buildlink3/bsd.builtin.mk"
###
@@ -16,6 +19,22 @@ IS_BUILTIN.binutils?= yes
.else
IS_BUILTIN.binutils?= no
.endif
+MAKEVARS+= IS_BUILTIN.binutils
+
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.binutils) && !empty(IS_BUILTIN.binutils:M[yY][eE][sS])
+. if !empty(TOOLS_PLATFORM.readelf)
+BUILTIN_VERSION.binutils!= \
+ ${TOOLS_PLATFORM.readelf} --version | \
+ ${SED} -ne 's,^.*Binutils.*)[ ]*\([0-9\.]*\),\1,p'
+. endif
+BUILTIN_VERSION.binutils?= _unknownversion_
+BUILTIN_PKG.binutils= binutils-${BUILTIN_VERSION.binutils}
+.endif
+MAKEVARS+= BUILTIN_PKG.binutils
###
### Determine whether we should use the built-in implementation if it
@@ -52,7 +71,6 @@ USE_BUILTIN.binutils= no
. endfor
. endif # PREFER.binutils
.endif
-MAKEVARS+= USE_BUILTIN.binutils
# if USE_BINUTILS is defined, then force the use of a true binutils
# implementation.
@@ -63,6 +81,8 @@ USE_BUILTIN.binutils= no
. endif
.endif
+MAKEVARS+= USE_BUILTIN.binutils
+
###
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
@@ -70,12 +90,6 @@ USE_BUILTIN.binutils= no
CHECK_BUILTIN.binutils?= no
.if !empty(CHECK_BUILTIN.binutils:M[nN][oO])
-. if !empty(USE_BUILTIN.binutils:M[nN][oO])
-AR= ${BUILDLINK_PREFIX.binutils}/bin/ar
-AS= ${BUILDLINK_PREFIX.binutils}/bin/as
-LD= ${BUILDLINK_PREFIX.binutils}/bin/ld
-NM= ${BUILDLINK_PREFIX.binutils}/bin/nm
-RANLIB= ${BUILDLINK_PREFIX.binutils}/bin/ranlib
-. endif
+USE_TOOLS+= ar as ld nm ranlib
.endif # CHECK_BUILTIN.binutils
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 77e31544542..696f8d26cd7 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2014/04/17 13:08:24 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2014/09/10 10:14:07 richard Exp $
DISTNAME= gmp-6.0.0a
+PKGREVISION= 1
CATEGORIES= devel math
MASTER_SITES= https://gmplib.org/download/gmp/ \
${MASTER_SITE_GNU:=gmp/}
@@ -28,6 +29,8 @@ PLIST_VARS+= cxx
.include "../../mk/bsd.prefs.mk"
+LDFLAGS.SunOS+= -Wl,-zignore # avoid unused references to libgcc_s
+
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
.endif
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index b5efa7dd907..5a7d0abd455 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.95 2014/09/01 12:39:15 jperkin Exp $
+$NetBSD: distinfo,v 1.96 2014/09/10 10:14:07 richard Exp $
SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
Size (libtool-2.4.2.tar.gz) = 2632347 bytes
SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda
-SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
+SHA1 (patch-ab) = 4bf7e3391791a1dda353d4abf3290e4c87be1f9a
+SHA1 (patch-ac) = b41459989ea1fbd906e48ac0a9948661b4a466ca
SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index bf2b58feb2d..3fe2e96d1d4 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.42 2014/09/01 12:39:15 jperkin Exp $
+$NetBSD: manual-libtool.m4,v 1.43 2014/09/10 10:14:07 richard Exp $
--- libltdl/m4/libtool.m4.orig 2011-10-17 10:17:05.000000000 +0000
+++ libltdl/m4/libtool.m4
@@ -447,9 +447,9 @@ $NetBSD: manual-libtool.m4,v 1.42 2014/09/01 12:39:15 jperkin Exp $
- # linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 005788f5e28..4a5e8a09f9f 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.82 2014/09/01 12:39:15 jperkin Exp $
+$NetBSD: patch-ab,v 1.83 2014/09/10 10:14:07 richard Exp $
--- configure.orig 2011-10-17 10:18:58.000000000 +0000
+++ configure
@@ -451,9 +451,9 @@ $NetBSD: patch-ab,v 1.82 2014/09/01 12:39:15 jperkin Exp $
- # linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+ $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 39507505e37..214be10f167 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,6 +1,12 @@
-$NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
+$NetBSD: patch-ac,v 1.32 2014/09/10 10:14:07 richard Exp $
---- libltdl/config/ltmain.sh.orig Mon Oct 17 10:19:11 2011
+Add passthrough support for -fstack-protector*
+http://permalink.gmane.org/gmane.comp.gnu.libtool.bugs/7341
+
+Disable the opt_duplicate_compiler_generated_deps optimisation
+for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+
+--- libltdl/config/ltmain.sh.orig 2011-10-17 10:19:35.000000000 +0000
+++ libltdl/config/ltmain.sh
@@ -133,8 +133,9 @@ $lt_unset CDPATH
# function.
@@ -14,7 +20,34 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${MAKE="make"}
-@@ -7391,6 +7392,7 @@ func_mode_link ()
+@@ -1180,7 +1181,9 @@ func_enable_tag "$optarg"
+ test "$opt_debug" = : || func_append preserve_args " --debug"
+
+ case $host in
+- *cygwin* | *mingw* | *pw32* | *cegcc*)
++ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=1645
++ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
++ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+@@ -5847,13 +5850,14 @@ func_mode_link ()
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
++ # -fstack-protector* stack protector flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+@@ -7391,6 +7395,7 @@ func_mode_link ()
# Calculate the version variables.
major=
versuffix=
@@ -22,7 +55,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
verstring=
case $version_type in
none) ;;
-@@ -7451,6 +7453,7 @@ func_mode_link ()
+@@ -7451,6 +7456,7 @@ func_mode_link ()
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
@@ -30,7 +63,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
;;
osf)
-@@ -7511,8 +7514,10 @@ func_mode_link ()
+@@ -7511,8 +7517,10 @@ func_mode_link ()
esac
if test "$need_version" = no; then
versuffix=
@@ -41,7 +74,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
fi
fi
-@@ -7520,6 +7525,7 @@ func_mode_link ()
+@@ -7520,6 +7528,7 @@ func_mode_link ()
if test "$avoid_version" = yes && test "$need_version" = no; then
major=
versuffix=
@@ -49,7 +82,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
verstring=""
fi
-@@ -7630,7 +7636,7 @@ func_mode_link ()
+@@ -7630,7 +7639,7 @@ func_mode_link ()
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
@@ -58,7 +91,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
# Do not include libc due to us having libc/libc_r.
;;
*-*-sco3.2v5* | *-*-sco5v6*)
-@@ -7653,6 +7659,7 @@ func_mode_link ()
+@@ -7653,12 +7662,14 @@ func_mode_link ()
libname_save=$libname
release_save=$release
versuffix_save=$versuffix
@@ -66,7 +99,6 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
major_save=$major
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
-@@ -7659,6 +7666,7 @@ func_mode_link ()
# add it in twice. Is that correct?
release=""
versuffix=""
@@ -74,7 +106,7 @@ $NetBSD: patch-ac,v 1.31 2014/05/10 15:32:08 joerg Exp $
major=""
newdeplibs=
droppeddeps=no
-@@ -7935,6 +7943,7 @@ EOF
+@@ -7935,6 +7946,7 @@ EOF
;;
esac
versuffix=$versuffix_save
diff --git a/devel/m4/hacks.mk b/devel/m4/hacks.mk
index 44b011660bb..ef5b2409531 100644
--- a/devel/m4/hacks.mk
+++ b/devel/m4/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2007/09/25 01:23:24 dmcmahill Exp $
+# $NetBSD: hacks.mk,v 1.2 2014/09/10 10:14:07 richard Exp $
.if !defined(M4_HACKS_MK)
M4_HACKS_MK= defined
@@ -18,7 +18,8 @@ M4_HACKS_MK= defined
### (nil))
### frexp.c:167: internal compiler error: in reload_cse_simplify_operands, at reload1.c:8378
###
-.if !empty(PKGSRC_COMPILER:Mgcc) && ${OPSYS} == "SunOS"
+.if !empty(PKGSRC_COMPILER:Mgcc) && ${OPSYS} == "SunOS" \
+ && !empty(MACHINE_ARCH:Msparc*)
PKG_HACKS+= optimisation
BUILDLINK_TRANSFORM+= rm:-O[0-9]*
.endif
diff --git a/devel/py-hgnested/DESCR b/devel/py-hgnested/DESCR
new file mode 100644
index 00000000000..ca20abb1d3b
--- /dev/null
+++ b/devel/py-hgnested/DESCR
@@ -0,0 +1,9 @@
+hgnested is a Mercurial extension to work with nested repositories.
+
+It was inspired by the forest extension by Robin Farine.
+
+The extension allows to apply common Mercurial commands to all the nested
+repositories at once like pull, push etc. It also allows to fetch a complete
+tree of repositories through ssh or http.
+
+See hg help hgnested for the complete list of commands.
diff --git a/devel/py-hgnested/MESSAGE b/devel/py-hgnested/MESSAGE
new file mode 100644
index 00000000000..8c670513fda
--- /dev/null
+++ b/devel/py-hgnested/MESSAGE
@@ -0,0 +1,23 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2014/09/10 10:14:07 richard Exp $
+
+hgnested is a Mercurial extension to work with nested repositories.
+
+It was inspired by the forest extension.
+
+The extension allows to apply common Mercurial commands to all the nested
+repositories at once like pull, push etc. It also allows to fetch a complete
+tree of repositories through ssh or http.
+
+To enable the "hgnested" extension, create an entry for it in your hgrc, like
+this:
+
+ [extensions]
+ hgnested =
+
+See `hg help hgnested` for the complete list of commands.
+
+For more information please visit the following website:
+
+ http://code.google.com/p/hgnested/
+===========================================================================
diff --git a/devel/py-hgnested/Makefile b/devel/py-hgnested/Makefile
new file mode 100644
index 00000000000..b0b9101fc2b
--- /dev/null
+++ b/devel/py-hgnested/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2014/09/10 10:14:08 richard Exp $
+
+DISTNAME= hgnested-0.6
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= devel
+MASTER_SITES= http://hgnested.googlecode.com/files/
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://code.google.com/p/hgnested/
+COMMENT= Mercurial extension to work with nested repositories
+LICENSE= gnu-gpl-v3
+
+USE_LANGUAGES= # none
+
+DEPENDS+= ${PYPKGPREFIX}-mercurial>=1.6:../../devel/py-mercurial
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-hgnested/PLIST b/devel/py-hgnested/PLIST
new file mode 100644
index 00000000000..a324c601dc3
--- /dev/null
+++ b/devel/py-hgnested/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2014/09/10 10:14:08 richard Exp $
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/hgnested/__init__.py
+${PYSITELIB}/hgnested/__init__.pyc
+${PYSITELIB}/hgnested/__init__.pyo
diff --git a/devel/py-hgnested/distinfo b/devel/py-hgnested/distinfo
new file mode 100644
index 00000000000..000018f5d9f
--- /dev/null
+++ b/devel/py-hgnested/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/09/10 10:14:08 richard Exp $
+
+SHA1 (hgnested-0.6.tar.gz) = 41aaf34f1cd55778cea1fb9327d96e079ded6d55
+RMD160 (hgnested-0.6.tar.gz) = 6f8c6e45813b9031efdbdd49788f61cd245543ab
+Size (hgnested-0.6.tar.gz) = 20020 bytes
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 4780d42d53e..5d2a4d0b3b3 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/06/25 06:00:39 richard Exp $
+# $NetBSD: Makefile,v 1.10 2014/09/10 10:14:08 richard Exp $
-TRYTON_CLIENT_REVISION=1
+TRYTON_CLIENT_REVISION= 3
.include "../../devel/py-trytond/Makefile.common"
DISTNAME= tryton-${TRYTON_VERSION}
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
diff --git a/devel/py-tryton/distinfo b/devel/py-tryton/distinfo
index c8693514a3e..52422962c7b 100644
--- a/devel/py-tryton/distinfo
+++ b/devel/py-tryton/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/06/06 12:48:00 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/09/10 10:14:08 richard Exp $
-SHA1 (tryton-3.2.1.tar.gz) = e97455fbac90c08d664a652b31e73a8f251be62b
-RMD160 (tryton-3.2.1.tar.gz) = 890e8c08d6692996883135b5c0f5a36703a4ccd7
-Size (tryton-3.2.1.tar.gz) = 808894 bytes
+SHA1 (tryton-3.2.3.tar.gz) = 91438f398ee969d1249028af5cdae954885a1b8c
+RMD160 (tryton-3.2.3.tar.gz) = 494c613245336c45717f99f9d938d6a440be3fb8
+Size (tryton-3.2.3.tar.gz) = 809497 bytes
SHA1 (patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py) = 5a6f2fdf6bcdef39201e516959b4b40ed58d68bd
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 9f5c5268a07..d8f06a0b451 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2013/11/30 11:14:10 richard Exp $
+# $NetBSD: Makefile,v 1.49 2014/09/10 10:14:08 richard Exp $
DISTNAME= zlib-1.2.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
http://zlib.net/
@@ -20,6 +20,7 @@ PKGCONFIG_OVERRIDE+= zlib.pc.in
CFLAGS+= ${CPPFLAGS}
LDFLAGS.Cygwin= -no-undefined
+LDFLAGS.SunOS+= -Wl,-zignore # avoid unused reference to libgcc_s.so
SUBST_CLASSES+= pc
SUBST_MESSAGE.pc= pkg-config file substitutions