From 8307099b054868a63a3f59d7deae727adcae7c16 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Mon, 8 Apr 2013 18:28:43 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- doc/CHANGES-2013 | 4 +- doc/TODO | 18 ++++--- games/grhino/Makefile | 5 +- games/grhino/distinfo | 22 ++++---- games/grhino/patches/patch-Makefile.in | 60 ++++++++++++++++++++++ games/grhino/patches/patch-book.cc | 12 ----- games/grhino/patches/patch-game.cc | 12 ----- games/grhino/patches/patch-log__proc.h | 12 ----- lang/squeak-vm/Makefile | 6 +-- www/py-django-cms/Makefile | 4 +- www/py-django-cms/distinfo | 9 ++-- .../patches/patch-cms_____init____.py | 21 -------- 12 files changed, 94 insertions(+), 91 deletions(-) rewrite games/grhino/distinfo (62%) create mode 100644 games/grhino/patches/patch-Makefile.in delete mode 100644 games/grhino/patches/patch-book.cc delete mode 100644 games/grhino/patches/patch-game.cc delete mode 100644 games/grhino/patches/patch-log__proc.h delete mode 100644 www/py-django-cms/patches/patch-cms_____init____.py diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 34aa0b200f4..668e2a0232c 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1194 2013/04/08 14:34:00 mef Exp $ +$NetBSD: CHANGES-2013,v 1.1196 2013/04/08 20:40:14 adam Exp $ Changes to the packages collection and infrastructure in 2013: @@ -1896,3 +1896,5 @@ Changes to the packages collection and infrastructure in 2013: Updated multimedia/gstreamer1 to 1.0.6 [drochner 2013-04-08] Updated graphics/veusz to 1.17 [drochner 2013-04-08] Updated databases/gramps3 to 3.4.3 [drochner 2013-04-08] + Updated www/py-django-cms to 2.3.6 [adam 2013-04-08] + Updated games/grhino to 0.16.1 [prlw1 2013-04-08] diff --git a/doc/TODO b/doc/TODO index 7b96b81438b..2f639c47b4a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.12054 2013/04/08 14:34:00 mef Exp $ +$NetBSD: TODO,v 1.12056 2013/04/08 21:52:29 wiz Exp $ Suggested new packages ====================== @@ -409,6 +409,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o attica-0.4.1 o audacious-plugins-2.4.4 o audacity-2.0.2 [wip (audacity-devel)] + o autoconf-archive-20130406 o autoconvert-0.3.16 o autogen-5.17.3 o avcheck-0.91 @@ -489,6 +490,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o dap-3.7 o dar-2.4.10 o darcs-2.4 + o darktable-1.2 o dasher-4.11 o dasm-2.20.11 o dbench-4.0 @@ -666,7 +668,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gpsim-0.26.1 o gramofile-1.6P o graphviz-2.30.1 - o grhino-0.16.1 o groff-1.22.2 o groonga-2.1.1 [pthread_mutexattr_setpshared() is missing on NetBSD-5] o gsharutils-4.13.4 @@ -719,7 +720,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o httptunnel-3.3 o hugin-2012.0.0 o hylafax-6.0.5 - o i3-4.5 + o i3-4.5.1 o ibus-1.5.0 o icc11-13.0 o icdprog-0.5 @@ -756,7 +757,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o kapooka-0.3 o kbiff-4.0 o kdbg-2.5.3 - o kdenlive-0.9.2 + o kdenlive-0.9.6 o kdrill-6.5 o kid3-2.3 o kismet-2011.03r2 [pkg/45692] @@ -971,6 +972,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o php-jpgraph-3.0.6 o php-owncloud-5.0.3 o php-tt-rss-1.7.8 + o phpmyadmin-3.5.8 o picp-0.6.8 o pim6dd-20040819a o pim6sd-20040824a @@ -1004,7 +1006,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o pulseaudio-3.0 o puppet-2.7.6 o puzzle-9173 - o puzzles-9818 + o puzzles-9823 o pv-1.2.0 o pvs-5.0 o pwlib-1.11.1 @@ -1187,7 +1189,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o unrealircd-3.2.10 o userppp-030706 o utilisp-1.14 - o vala-0.20.0 + o vala-0.20.1 o vbetool-1.1 o vera-1.17 o vfu-4.09 @@ -1260,7 +1262,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o xf86-video-glint-1.2.8 o xf86-video-i128-1.3.6 o xf86-video-i740-1.3.4 - o xf86-video-intel-2.21.5 + o xf86-video-intel-2.21.6 o xf86-video-mach64-6.9.4 o xf86-video-mga-1.6.2 o xf86-video-neomagic-1.2.7 @@ -1304,7 +1306,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o xmms-crossfade-0.3.14 o xmms-musepack-1.8.0 [http://dl.slik.org/musepack/xmms-musepack-1.8.0.tar.gz] o xmon-1.5.6 - o xmp-4.0.3 + o xmp-4.0.2 o xmule-1.12.2 o xnap-2.5r3 o xorp-1.8.5 diff --git a/games/grhino/Makefile b/games/grhino/Makefile index 2355f7c0a3a..38c46f63461 100644 --- a/games/grhino/Makefile +++ b/games/grhino/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2013/02/06 23:22:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.59 2013/02/16 11:21:20 wiz Exp $ # -DISTNAME= grhino-0.16.0 -PKGREVISION= 21 +DISTNAME= grhino-0.16.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rhino/} diff --git a/games/grhino/distinfo b/games/grhino/distinfo dissimilarity index 62% index 9ad16e0629b..022a47e1380 100644 --- a/games/grhino/distinfo +++ b/games/grhino/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.12 2008/04/27 06:36:02 wiz Exp $ - -SHA1 (grhino-0.16.0.tar.gz) = ca76895fc2370995e4942aec98e4359ce5549925 -RMD160 (grhino-0.16.0.tar.gz) = f91415e5263eec3837a2a0cb06b610f0ba64668f -Size (grhino-0.16.0.tar.gz) = 1172321 bytes -SHA1 (patch-aa) = 762ad3cffe3ab40a070cdf89f06d5b302a963965 -SHA1 (patch-aiai.cc) = 01c99b4d16c9ead4a0c95c8e91a8111c59f9446d -SHA1 (patch-book.cc) = a120f2c718c85666dfe6acd76bb3b49a8e5863fa -SHA1 (patch-game.cc) = d6c0a2036653d1920f4b0ea9f770c00fd1718ada -SHA1 (patch-gen__book.cc) = 9cefade318b76df658d0d5959cc6378f5275a971 -SHA1 (patch-gen__pattern.cc) = 90ef9ca71921e0a1bd86dcb5aacdad7a4d0aa360 -SHA1 (patch-log__proc.h) = 058fc9c9052a5126c0de137ad0087c667bb663c4 +$NetBSD: distinfo,v 1.13 2011/11/24 14:08:05 joerg Exp $ + +SHA1 (grhino-0.16.1.tar.gz) = d9c13d88980bb37d5172193bdab088c7a987c1c2 +RMD160 (grhino-0.16.1.tar.gz) = e0b77cfe4ba8215dda5701c3ddcf753a5fbc9358 +Size (grhino-0.16.1.tar.gz) = 1178091 bytes +SHA1 (patch-Makefile.in) = 877fcdf01b7de51b33370a71ef0dcee6a286fba6 +SHA1 (patch-aa) = 762ad3cffe3ab40a070cdf89f06d5b302a963965 +SHA1 (patch-aiai.cc) = 01c99b4d16c9ead4a0c95c8e91a8111c59f9446d +SHA1 (patch-gen__book.cc) = 9cefade318b76df658d0d5959cc6378f5275a971 +SHA1 (patch-gen__pattern.cc) = 90ef9ca71921e0a1bd86dcb5aacdad7a4d0aa360 diff --git a/games/grhino/patches/patch-Makefile.in b/games/grhino/patches/patch-Makefile.in new file mode 100644 index 00000000000..e66e92a3d22 --- /dev/null +++ b/games/grhino/patches/patch-Makefile.in @@ -0,0 +1,60 @@ +$NetBSD$ + +Fix solaris build - PR pkg/34215 +https://sourceforge.net/tracker/?func=detail&aid=3610330&group_id=13362&atid=113362 +--- Makefile.in.orig 2013-04-07 08:31:30.000000000 +0000 ++++ Makefile.in +@@ -452,43 +452,43 @@ distclean : distclean_curdir + $(adBeginSubdir) $@ $(adEndSubdir) + + install_mkdir : +- if [ ! -e "$(DESTDIR)$(bindir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(bindir)" ]; then \ + mkdir -p "$(DESTDIR)$(bindir)"; \ + chmod 755 "$(DESTDIR)$(bindir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(icon_dir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(icon_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(icon_dir)"; \ + chmod 755 "$(DESTDIR)$(icon_dir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(pattern_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(pattern_dir)"; \ + chmod 755 "$(DESTDIR)$(pattern_dir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(book_dir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(book_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(book_dir)"; \ + chmod 755 "$(DESTDIR)$(book_dir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(theme_dir)" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)"; \ + chmod 755 "$(DESTDIR)$(theme_dir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then \ ++ if [ ! -d "$(DESTDIR)$(theme_dir)/small" ]; then \ + mkdir -p "$(DESTDIR)$(theme_dir)/small"; \ + chmod 755 "$(DESTDIR)$(theme_dir)/small"; \ + fi +- if [ ! -e "$(DESTDIR)$(omfdir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(omfdir)" ]; then \ + mkdir -p "$(DESTDIR)$(omfdir)"; \ + chmod 755 "$(DESTDIR)$(omfdir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(helpdir)" ]; then \ ++ if [ ! -d "$(DESTDIR)$(helpdir)" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)"; \ + chmod 755 "$(DESTDIR)$(helpdir)"; \ + fi +- if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then \ ++ if [ ! -d "$(DESTDIR)$(helpdir)/C" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C"; \ + fi +- if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then \ ++ if [ ! -d "$(DESTDIR)$(helpdir)/C/figures" ]; then \ + mkdir -p "$(DESTDIR)$(helpdir)/C/figures"; \ + chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \ + fi diff --git a/games/grhino/patches/patch-book.cc b/games/grhino/patches/patch-book.cc deleted file mode 100644 index e634c247f87..00000000000 --- a/games/grhino/patches/patch-book.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- book.cc.orig 2011-11-24 01:11:40.000000000 +0000 -+++ book.cc -@@ -25,6 +25,7 @@ - #include "rand.h" - #include "gtstream.h" - -+#include - #include - #include - #include diff --git a/games/grhino/patches/patch-game.cc b/games/grhino/patches/patch-game.cc deleted file mode 100644 index e6ad6ad3496..00000000000 --- a/games/grhino/patches/patch-game.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- game.cc.orig 2011-11-24 01:12:02.000000000 +0000 -+++ game.cc -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #ifdef _ - # undef _ diff --git a/games/grhino/patches/patch-log__proc.h b/games/grhino/patches/patch-log__proc.h deleted file mode 100644 index b9e108f6ccd..00000000000 --- a/games/grhino/patches/patch-log__proc.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- log_proc.h.orig 2011-11-24 01:12:41.000000000 +0000 -+++ log_proc.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include "board.h" - #include "order.h" diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile index 2934b4fde45..a0f36840ff4 100644 --- a/lang/squeak-vm/Makefile +++ b/lang/squeak-vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/04/06 15:46:36 rodent Exp $ +# $NetBSD: Makefile,v 1.23 2013/04/08 16:45:33 asau Exp $ # SQUEAK_VERSION= 4.10.2.2614 @@ -22,7 +22,7 @@ USE_LANGUAGES= c c++ USE_CMAKE= yes USE_TOOLS= gzip -CONFIGURE_DIRS= ${WRKSRC}/build +CONFIGURE_DIRS= build CMAKE_ARG_PATH= ../unix #CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE # debug CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR} @@ -45,7 +45,7 @@ PLIST_SUBST= SQUEAK_VERSION=${SQUEAK_VERSION} PLIST_VARS+= oss pre-configure: - ${MKDIR} ${CONFIGURE_DIRS} + ${MKDIR} ${WRKSRC}/${CONFIGURE_DIRS} .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index a313867b0c5..c6a29bb70ca 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2012/12/01 18:42:14 adam Exp $ +# $NetBSD: Makefile,v 1.13 2012/12/09 20:32:37 adam Exp $ -DISTNAME= django-cms-2.3.5 +DISTNAME= django-cms-2.3.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= www python MASTER_SITES= http://pypi.python.org/packages/source/d/django-cms/ diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo index 5f73e4a7829..bd277309ea3 100644 --- a/www/py-django-cms/distinfo +++ b/www/py-django-cms/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2012/12/09 20:32:37 adam Exp $ +$NetBSD: distinfo,v 1.9 2013/04/01 12:31:23 joerg Exp $ -SHA1 (django-cms-2.3.5.tar.gz) = 6f8326cbc024b721d5ae3b95cbecd0cad90163eb -RMD160 (django-cms-2.3.5.tar.gz) = 8a5a38105307c6dee8d8d076bd0b98a597893328 -Size (django-cms-2.3.5.tar.gz) = 3696175 bytes -SHA1 (patch-cms_____init____.py) = 52b93489fc15272edc8256e9682de1642baab14c +SHA1 (django-cms-2.3.6.tar.gz) = 1e8f8c0fca91b1d90e1b773eced3f7f768ef1341 +RMD160 (django-cms-2.3.6.tar.gz) = 442b8b0bb7ae5e05ec635d4fbe609ee02ee7b923 +Size (django-cms-2.3.6.tar.gz) = 3753134 bytes diff --git a/www/py-django-cms/patches/patch-cms_____init____.py b/www/py-django-cms/patches/patch-cms_____init____.py deleted file mode 100644 index c9b85911b85..00000000000 --- a/www/py-django-cms/patches/patch-cms_____init____.py +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD$ - ---- cms/__init__.py.orig 2013-03-31 16:23:04.000000000 +0000 -+++ cms/__init__.py -@@ -1,12 +1,16 @@ - # -*- coding: utf-8 -*- - __version__ = '2.3.5' - -+import django.core.exceptions -+ - # patch settings - try: - from django.conf import settings - if 'cms' in settings.INSTALLED_APPS: - from conf import patch_settings - patch_settings() -+except django.core.exceptions.ImproperlyConfigured: -+ pass - except ImportError: # pragma: no cover - """ - This exception means that either the application is being built, or is -- 2.11.4.GIT