Permalink
Browse files

Merge remote-tracking branch 'upstream/trunk' into trunk

  • Loading branch information...
2 parents 7962f2e + 862bb24 commit 4d3b8f8d2c2c5401302888c1336b299a2fa39300 @mamash mamash committed Aug 8, 2012
Showing 489 changed files with 11,511 additions and 4,527 deletions.
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/01/25 00:09:45 zafer Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/05 00:47:45 wen Exp $
#
-DISTNAME= pigz-2.1.6
+DISTNAME= pigz-2.2.5
CATEGORIES= archivers
MASTER_SITES= http://zlib.net/pigz/
@@ -11,13 +11,14 @@ COMMENT= Parallel implementation of gzip
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
-INSTALLATION_DIRS= bin share/doc/pigz
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/pigz
BUILD_TARGET= pigz
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pigz ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pigz
+ ${INSTALL_MAN} ${WRKSRC}/pigz.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
.include "../../devel/zlib/buildlink3.mk"
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/13 19:44:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/08/05 00:47:45 wen Exp $
bin/pigz
+man/man1/pigz.1
share/doc/pigz/README
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2011/11/29 06:06:23 sbd Exp $
+$NetBSD: distinfo,v 1.5 2012/08/05 00:47:45 wen Exp $
-SHA1 (pigz-2.1.6.tar.gz) = df05bdcc7b08246a3c1e6a2ab2edc7d0a45c0369
-RMD160 (pigz-2.1.6.tar.gz) = 715a90eefbb9d2f6dbd94ec7ee196a0ea7b32e7f
-Size (pigz-2.1.6.tar.gz) = 52250 bytes
-SHA1 (patch-Makefile) = 01cc47ba7ad377e7c92a85f368f0a952900c8fce
+SHA1 (pigz-2.2.5.tar.gz) = 8c7895c7891a4945050a2f6308b9fe3d6b4c28fc
+RMD160 (pigz-2.2.5.tar.gz) = 314ca57edd1d18d0b8b5317c588d45672e61fb3e
+Size (pigz-2.2.5.tar.gz) = 49717 bytes
+SHA1 (patch-Makefile) = d5eeef4b68c9787f0ec3772418194a121789e81c
@@ -1,16 +1,17 @@
-$NetBSD: patch-Makefile,v 1.1 2011/11/29 06:06:23 sbd Exp $
+$NetBSD: patch-Makefile,v 1.2 2012/08/05 00:47:45 wen Exp $
Honor CFLAGS and LDFLAGS from pkgsrc.
---- Makefile.orig 2010-01-17 21:16:18.000000000 +0000
+--- Makefile.orig 2012-02-12 05:18:18.000000000 +0000
+++ Makefile
-@@ -1,7 +1,7 @@
--CFLAGS=-O3
-+CFLAGS?=-O3
+@@ -1,8 +1,8 @@
+ CC=cc
+-CFLAGS=-O3 -Wall -Wextra
++CFLAGS?=-O3 -Wall -Wextra
pigz: pigz.o yarn.o
-- cc -o pigz pigz.o yarn.o -lpthread -lz
-+ cc ${LDFLAGS} -o pigz pigz.o yarn.o -lpthread -lz
+- $(CC) -o pigz pigz.o yarn.o -lpthread -lz
++ $(CC) ${LDFLAGS} -o pigz pigz.o yarn.o -lpthread -lz
ln -f pigz unpigz
pigz.o: pigz.c yarn.h
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/04/28 13:55:58 taca Exp $
+# $NetBSD: Makefile,v 1.10 2012/07/31 13:44:30 taca Exp $
-DISTNAME= rubyzip-0.9.8
+DISTNAME= rubyzip-0.9.9
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby//}
CATEGORIES= archivers
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/04/28 13:55:58 taca Exp $
+$NetBSD: distinfo,v 1.9 2012/07/31 13:44:30 taca Exp $
-SHA1 (rubyzip-0.9.8.gem) = d2da6b88afb07839fdf878397481a17a54a03e23
-RMD160 (rubyzip-0.9.8.gem) = a1c8746bee960631a57ac4006bcf682b32f58c5e
-Size (rubyzip-0.9.8.gem) = 31232 bytes
+SHA1 (rubyzip-0.9.9.gem) = 5756f7bd2f68ef2084afe3d1f379bed26ab302eb
+RMD160 (rubyzip-0.9.9.gem) = 50f7176df85a2280f4283bc1f38ab887f4cff1be
+Size (rubyzip-0.9.9.gem) = 31744 bytes
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/03/08 04:04:19 sbd Exp $
+$NetBSD: distinfo,v 1.12 2012/08/02 12:52:33 jperkin Exp $
SHA1 (alsa-lib-1.0.22.tar.bz2) = d3b6c740c23b8d113a8d02da2a9fd61f5d1a8a44
RMD160 (alsa-lib-1.0.22.tar.bz2) = 4dbc3f9550f8ba01535ad3cfd8f0a8140f897e81
@@ -40,5 +40,6 @@ SHA1 (patch-bh) = f207843f4ce2b20b7e680d4b6e9aebb28c55323e
SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
SHA1 (patch-bk) = 7740eea6a0d4a8ce3db3b93b2af5faacdb9424b1
+SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d
SHA1 (patch-include_pcm.h) = 1c458cd7d078356f4a970b0b3592aad139ac0918
SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_iatomic.h,v 1.1 2012/08/02 12:52:33 jperkin Exp $
+
+Use __asm__ and __volatile__
+
+--- include/iatomic.h.orig Thu Aug 2 12:47:59 2012
++++ include/iatomic.h Thu Aug 2 12:49:53 2012
+@@ -211,9 +211,9 @@
+ #define rmb() mb()
+ #define wmb() __asm__ __volatile__ ("": : :"memory")
+ #else
+-#define mb() asm volatile("mfence":::"memory")
+-#define rmb() asm volatile("lfence":::"memory")
+-#define wmb() asm volatile("sfence":::"memory")
++#define mb() __asm__ __volatile__ ("mfence":::"memory")
++#define rmb() __asm__ __volatile__ ("lfence":::"memory")
++#define wmb() __asm__ __volatile__ ("sfence":::"memory")
+ #endif
+
+ #undef ATOMIC_SMP_LOCK
View
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.16 2012/05/04 16:01:53 joerg Exp $
+$NetBSD: distinfo,v 1.17 2012/08/07 20:18:20 marino Exp $
-SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
-RMD160 (xmcd-3.0.2.tar.gz) = 9fbee32681e8df4623a06b49ee64ac328478623b
-Size (xmcd-3.0.2.tar.gz) = 690285 bytes
SHA1 (xmcd-3.0.2-proxyauth-patch) = a6114c73e5470747fe2dcfe16cb11bc7c5e5b4dd
RMD160 (xmcd-3.0.2-proxyauth-patch) = 405be2eefaaf51fc029828d5850b9f5c78cef5b2
Size (xmcd-3.0.2-proxyauth-patch) = 2922 bytes
+SHA1 (xmcd-3.0.2.tar.gz) = 10258f299f917c94780d3e6d9feb57535d4603b5
+RMD160 (xmcd-3.0.2.tar.gz) = 9fbee32681e8df4623a06b49ee64ac328478623b
+Size (xmcd-3.0.2.tar.gz) = 690285 bytes
SHA1 (patch-aa) = 0a446d2943dd9ac9d66938674daa16d1d629e470
-SHA1 (patch-ab) = 2721877c17a7e810a4039be7056d015b87d94273
+SHA1 (patch-ab) = 35c9d7cfecbd276a034598375c033c0dd510acdf
SHA1 (patch-ac) = 19440a72fda657bf73811c20aabab5c955369516
SHA1 (patch-ad) = afddba8e5a6070a54131ce2530479d4add9e19a4
SHA1 (patch-ae) = 3de0e9fd004fcb6012f033739ff1b66bd059d655
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.12 2003/06/13 10:55:26 cjep Exp $
---- cda_d/Imakefile.orig Wed Aug 8 01:15:13 2001
-+++ cda_d/Imakefile Tue Jun 10 13:29:21 2003
+$NetBSD: patch-ab,v 1.13 2012/08/07 20:18:20 marino Exp $
+
+--- cda_d/Imakefile.orig 2001-08-08 00:15:13.000000000 +0000
++++ cda_d/Imakefile
@@ -53,7 +53,13 @@
DEFINES= -DBSDCOMPAT -DUSE_TERMIOS
#else
@@ -16,7 +17,14 @@ $NetBSD: patch-ab,v 1.12 2003/06/13 10:55:26 cjep Exp $
#else
#if defined(__bsdi__)
.if exists(/usr/include/ncurses.h)
-@@ -127,11 +133,16 @@
+@@ -121,17 +127,22 @@ LOCAL_LIBRARIES=-L/usr/5lib -lcurses
+ LOCAL_LIBRARIES=-lncurses
+ #else
+ #if defined(FreeBSDArchitecture)
+-LOCAL_LIBRARIES=-lncurses -lmytinfo
++LOCAL_LIBRARIES=-lncurses
+ .if exists(/usr/include/camlib.h)
+ LOCAL_LIBRARIES+= -lcam
.endif
#else
#if defined(NetBSDArchitecture)
View
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2012/06/14 07:44:14 sbd Exp $
+# $NetBSD: Makefile,v 1.43 2012/08/01 15:26:11 drochner Exp $
PKGNAME= finch-${PIDGIN_VERSION}
-PKGREVISION= 1
COMMENT= Multi-protocol Instant Messaging client console frontend
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2012/06/14 07:43:40 sbd Exp $
+# $NetBSD: Makefile,v 1.44 2012/08/01 15:23:45 drochner Exp $
PKGNAME= libpurple-${PIDGIN_VERSION}
-PKGREVISION= 1
COMMENT= Multi-protocol Instant Messaging client backend
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.38 2012/05/15 13:07:28 obache Exp $
+# $NetBSD: Makefile.common,v 1.39 2012/08/01 15:23:45 drochner Exp $
#
# used by chat/finch/Makefile
# used by chat/libpurple/Makefile
# used by chat/pidgin/Makefile
# used by chat/pidgin-sametime/Makefile
# used by chat/pidgin-silc/Makefile
-PIDGIN_VERSION= 2.10.4
+PIDGIN_VERSION= 2.10.6
DISTNAME= pidgin-${PIDGIN_VERSION}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --disable-gevolution
CONFIGURE_ARGS+= --disable-gtkui
CONFIGURE_ARGS+= --disable-consoleui
CONFIGURE_ARGS+= --disable-meanwhile
-CONFIGURE_ARGS+= --disable-farsight
+CONFIGURE_ARGS+= --disable-farstream
CONFIGURE_ARGS+= --disable-gstreamer
CONFIGURE_ARGS+= --disable-avahi
CONFIGURE_ARGS+= --disable-perl
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.35 2012/05/15 13:07:28 obache Exp $
+$NetBSD: distinfo,v 1.36 2012/08/01 15:23:46 drochner Exp $
-SHA1 (pidgin-2.10.4.tar.bz2) = f9ce34e69f97bcd1bb216aefb6d687b5b47f0796
-RMD160 (pidgin-2.10.4.tar.bz2) = 5193a7f5dbd122198d474bd7e11dc9bf307befb3
-Size (pidgin-2.10.4.tar.bz2) = 9970850 bytes
+SHA1 (pidgin-2.10.6.tar.bz2) = a0532e7ba2acd205d6a5a4e3624156a980fe3d43
+RMD160 (pidgin-2.10.6.tar.bz2) = 507d64cb719129196c887953edef552db326e805
+Size (pidgin-2.10.6.tar.bz2) = 10007092 bytes
SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29
SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2012/04/25 16:27:50 drochner Exp $
+# $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls
@@ -84,7 +84,7 @@ PLIST.vv= yes
.endif
.if !empty(PKG_OPTIONS:Mfarsight)
-CONFIGURE_ARGS+= --enable-farsight
+CONFIGURE_ARGS+= --enable-farstream
. include "../../multimedia/farsight2/buildlink3.mk"
.endif
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2012/06/14 07:44:14 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2012/08/01 15:26:11 drochner Exp $
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION= 1
COMMENT= Lotus Sametime plugin for the Pidgin instant messenger
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2012/06/14 07:44:14 sbd Exp $
+# $NetBSD: Makefile,v 1.33 2012/08/01 15:26:11 drochner Exp $
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION= 1
COMMENT= SILC plugin for the Pidgin instant messenger
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2012/06/14 07:43:41 sbd Exp $
+# $NetBSD: Makefile,v 1.43 2012/08/01 15:26:11 drochner Exp $
COMMENT= Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION= 1
PKG_DESTDIR_SUPPORT= user-destdir
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2011/03/14 12:50:48 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2012/08/01 15:26:54 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin
PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell farsight x11
@@ -19,10 +19,12 @@ PLIST.dbus= yes
.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
CONFIGURE_ARGS+= --enable-vv
PLIST.vv= yes
+.else
+CONFIGURE_ARGS+= --disable-vv
.endif
.if !empty(PKG_OPTIONS:Mfarsight)
-CONFIGURE_ARGS+= --enable-farsight
+CONFIGURE_ARGS+= --enable-farstream
. include "../../multimedia/farsight2/buildlink3.mk"
.endif
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2012/07/17 02:04:04 jnemeth Exp $
+# $NetBSD: Makefile,v 1.24 2012/08/03 08:52:31 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-10.6.1
+DISTNAME= asterisk-10.7.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.17 2012/07/17 02:04:04 jnemeth Exp $
+$NetBSD: distinfo,v 1.18 2012/08/03 08:52:31 jnemeth Exp $
-SHA1 (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = ba6cb7d0a07ca55d10e38b008c664734a17f1e53
-RMD160 (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = effd8239f99115355396284aeb934a6cb5aae452
-Size (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = 24989457 bytes
-SHA1 (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (patch-Makefile) = 1f351f6b3de49ee32be69cd8b8f88571b7ae9e03
+SHA1 (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = 8aa8112c86ea283554acb2aa4de98e826fbe44c2
+RMD160 (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = d26978f92ef5696da00c55ca227a12336a655d1b
+Size (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = 25006763 bytes
+SHA1 (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (patch-Makefile) = b8093ebafab8794a29c986e141aa692b04594de4
SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a
SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4
-SHA1 (patch-apps_app__queue.c) = e035995563eb5533d5261568fdb43e8adcf2fe35
+SHA1 (patch-apps_app__queue.c) = 3da85de105d0795e0e0c1fe2e6fc4f4ff77edc6f
SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88
Oops, something went wrong.

0 comments on commit 4d3b8f8

Please sign in to comment.