Import of pkgsrc-2014Q1

misc/Addresses/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2013/05/09 07:39:13 adam Exp $
+# $NetBSD: Makefile,v 1.28 2013/10/19 09:06:59 adam Exp $
 #
 
 DISTNAME=		Addresses-0.4.8
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc gnustep
 MASTER_SITES=		http://savannah.nongnu.org/download/gap/
 

misc/Addresses/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2013/01/26 21:36:36 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2013/10/19 09:06:59 adam Exp $
 
 BUILDLINK_TREE+=	Addresses
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Addresses
 ADDRESSES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.8
-BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.8nb1
+BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.8nb3
 BUILDLINK_PKGSRCDIR.Addresses?=	../../misc/Addresses
 
 .include "../../devel/gnustep-make/gnustep.mk"

misc/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.402 2013/05/28 12:55:22 wiz Exp $
+# $NetBSD: Makefile,v 1.423 2014/03/11 12:06:54 jperkin Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -22,6 +22,7 @@ SUBDIR+=	brs
 SUBDIR+=	bsdiff
 SUBDIR+=	bsdstats
 SUBDIR+=	buffer
+SUBDIR+=	byobu
 SUBDIR+=	calibre
 SUBDIR+=	celestia
 SUBDIR+=	chipmunk
@@ -40,7 +41,6 @@ SUBDIR+=	deskbar-applet
 SUBDIR+=	dgpsip
 SUBDIR+=	dialog
 SUBDIR+=	dirdiff
-SUBDIR+=	dnetc
 SUBDIR+=	dotfile
 SUBDIR+=	dpkg
 SUBDIR+=	dt
@@ -119,7 +119,6 @@ SUBDIR+=	kde-wallpapers4
 SUBDIR+=	kdeaccessibility3
 SUBDIR+=	kdeaddons3
 SUBDIR+=	kdeadmin3
-SUBDIR+=	kdeadmin4
 SUBDIR+=	kdeartwork3
 SUBDIR+=	kdeartwork4
 SUBDIR+=	kdeedu3
@@ -150,8 +149,10 @@ SUBDIR+=	koffice-l10n-pl
 SUBDIR+=	kp
 SUBDIR+=	kremotecontrol
 SUBDIR+=	kstars
+SUBDIR+=	kteatime
 SUBDIR+=	ktouch
 SUBDIR+=	kturtle
+SUBDIR+=	ktux
 SUBDIR+=	kwordquiz
 SUBDIR+=	kz_h8write
 SUBDIR+=	labelnation
@@ -165,6 +166,7 @@ SUBDIR+=	libkvkontakte
 SUBDIR+=	libquantum
 SUBDIR+=	libreoffice
 SUBDIR+=	libreoffice3-bin
+SUBDIR+=	libreoffice4
 SUBDIR+=	libreoffice4-bin
 SUBDIR+=	libutf
 SUBDIR+=	lile
@@ -192,7 +194,6 @@ SUBDIR+=	nxtvepg
 SUBDIR+=	open2300
 SUBDIR+=	open2300-mysql
 SUBDIR+=	openoffice3
-SUBDIR+=	openoffice3-bin
 SUBDIR+=	orca
 SUBDIR+=	p5-App-MrShell
 SUBDIR+=	p5-Array-PrintCols
@@ -205,7 +206,6 @@ SUBDIR+=	p5-ControlX10-CM17
 SUBDIR+=	p5-File-MMagic
 SUBDIR+=	p5-File-MMagic-XS
 SUBDIR+=	p5-File-Tail
-SUBDIR+=	p5-I18N-LangTags
 SUBDIR+=	p5-Locale-Codes
 SUBDIR+=	p5-Locale-Maketext
 SUBDIR+=	p5-Locale-Maketext-Fuzzy
@@ -230,6 +230,11 @@ SUBDIR+=	pty-redir
 SUBDIR+=	py-anita
 SUBDIR+=	py-anki2
 SUBDIR+=	py-carddav
+SUBDIR+=	py-trytond-company
+SUBDIR+=	py-trytond-party
+SUBDIR+=	py-trytond-product
+SUBDIR+=	py-trytond-stock
+SUBDIR+=	py-trytond-stock-lot
 SUBDIR+=	qbrew
 SUBDIR+=	qterm
 SUBDIR+=	raspberrypi-userland
@@ -244,18 +249,24 @@ SUBDIR+=	rpm
 SUBDIR+=	ruby-ansi
 SUBDIR+=	ruby-args_parser
 SUBDIR+=	ruby-bundler
+SUBDIR+=	ruby-colorator
 SUBDIR+=	ruby-columnize
 SUBDIR+=	ruby-commander
 SUBDIR+=	ruby-configuration
 SUBDIR+=	ruby-daemons
+SUBDIR+=	ruby-descendants_tracker
+SUBDIR+=	ruby-equalizer
 SUBDIR+=	ruby-gem_plugin
 SUBDIR+=	ruby-hashie
 SUBDIR+=	ruby-launchy
+SUBDIR+=	ruby-memoizable
+SUBDIR+=	ruby-naught
 SUBDIR+=	ruby-parallel
 SUBDIR+=	ruby-progressbar
 SUBDIR+=	ruby-rainbow
 SUBDIR+=	ruby-sprockets
 SUBDIR+=	ruby-sprockets22
+SUBDIR+=	ruby-thread_safe
 SUBDIR+=	ruby-transaction-simple
 SUBDIR+=	ruby-typed-array
 SUBDIR+=	rubygems
@@ -268,6 +279,7 @@ SUBDIR+=	siag
 SUBDIR+=	since
 SUBDIR+=	softmaker-office-demo
 SUBDIR+=	splitvt
+SUBDIR+=	starplot
 SUBDIR+=	stellarium
 SUBDIR+=	step
 SUBDIR+=	superkaramba
@@ -279,6 +291,7 @@ SUBDIR+=	tellico
 SUBDIR+=	tellico-kde3
 SUBDIR+=	teseq
 SUBDIR+=	tmux
+SUBDIR+=	toilet
 SUBDIR+=	topless
 SUBDIR+=	ttyrec
 SUBDIR+=	udfclient

misc/attica/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:11 tron Exp $
 
-DISTNAME=	attica-0.4.1
-PKGREVISION=	3
+DISTNAME=	attica-0.4.2
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_KDE:=attica/}
 EXTRACT_SUFX=	.tar.bz2

misc/attica/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2014/02/12 23:18:11 tron Exp $
 
 BUILDLINK_TREE+=	attica
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	attica
 ATTICA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.attica+=	attica>=0.1.2
-BUILDLINK_ABI_DEPENDS.attica+=	attica>=0.4.1nb3
+BUILDLINK_ABI_DEPENDS.attica+=	attica>=0.4.2nb1
 BUILDLINK_PKGSRCDIR.attica?=	../../misc/attica
 
 .include "../../x11/qt4-libs/buildlink3.mk"

misc/attica/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/04/13 23:03:32 markd Exp $
+$NetBSD: distinfo,v 1.6 2013/07/04 16:49:03 wiz Exp $
 
-SHA1 (attica-0.4.1.tar.bz2) = f4962636ec9282c32c4ceaec0c85f92ca5102b60
-RMD160 (attica-0.4.1.tar.bz2) = bcfa706a160b244cf4e68de4c537e20ec0ec36af
-Size (attica-0.4.1.tar.bz2) = 58742 bytes
+SHA1 (attica-0.4.2.tar.bz2) = 5ae4adcb99db839902b70afd3d1cc7fd471bacd7
+RMD160 (attica-0.4.2.tar.bz2) = fae94a0a9b9064b3e25a00a759e2ef450bffe7d8
+Size (attica-0.4.2.tar.bz2) = 57093 bytes

misc/autocue/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 09:57:16 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/10 14:23:45 joerg Exp $
 #
 
 DISTNAME=	autocue-20070224
@@ -23,4 +23,10 @@ do-install:
 	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/autocue.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=	rm:-Wno-traditional
+CFLAGS+=	-Wno-invalid-source-encoding
+.endif
+
 .include "../../mk/bsd.pkg.mk"

misc/autocue/files/autocue.1

@@ -1,4 +1,4 @@
-.\" $NetBSD: autocue.1,v 1.3 2007/03/02 20:38:21 wiz Exp $
+.\" $NetBSD: autocue.1,v 1.4 2013/07/20 21:50:52 wiz Exp $
 .\"
 .\" Copyright © 2006 Alistair Crooks.  All rights reserved.
 .\"
@@ -95,4 +95,4 @@ utility exits 0 on success, and \*[Gt]0 if an error occurs.
 The
 .Nm
 was written by
-.An Alistair Crooks Aq agc@NetBSD.org .
+.An Alistair Crooks Aq Mt agc@NetBSD.org .

misc/basket/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2013/06/06 12:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/02/12 23:18:12 tron Exp $
 
 DISTNAME=		basket-1.0.2
-PKGREVISION=		27
+PKGREVISION=		30
 CATEGORIES=		misc
 MASTER_SITES=		http://basket.kde.org/downloads/
 

misc/bbweather/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/05/31 12:41:26 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/11/16 07:08:14 shattered Exp $
 #
 
-DISTNAME=	bbweather-0.6.2
-PKGREVISION=	3
+DISTNAME=	bbweather-0.6.3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.netmeister.org/apps/
 EXTRACT_SUFX=	.tar.bz2

misc/bbweather/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 11:02:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2013/11/16 07:08:14 shattered Exp $
 
-SHA1 (bbweather-0.6.2.tar.bz2) = bdb3359876434a6d698a70a975312ca29b2116c4
-RMD160 (bbweather-0.6.2.tar.bz2) = 3a93b7597af12f4001c3b61495e93ed079867cd4
-Size (bbweather-0.6.2.tar.bz2) = 80487 bytes
+SHA1 (bbweather-0.6.3.tar.bz2) = 625c756548bd9ce1dd5cfa64838fda74545d926f
+RMD160 (bbweather-0.6.3.tar.bz2) = b216f048c91600c3eeeecf9fe68c7c1ff72e8292
+Size (bbweather-0.6.3.tar.bz2) = 80631 bytes

misc/blccc/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/06/06 12:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/10/10 14:42:23 ryoon Exp $
 #
 
 DISTNAME=		blccc-1.99
-PKGREVISION=		22
+PKGREVISION=		24
 CATEGORIES=		misc
 MASTER_SITES=		http://sven.gimp.org/blinkenlights/
 

misc/byobu/DESCR

@@ -0,0 +1,8 @@
+Byobu is a GPLv3 open source text-based window manager and terminal
+multiplexer. It was originally designed to provide elegant enhancements
+to the otherwise functional, plain, practical GNU Screen, for the
+Ubuntu server distribution. Byobu now includes an enhanced profiles,
+convenient keybindings, configuration utilities, and toggle-able
+system status notifications for both the GNU Screen window manager
+and the more modern Tmux terminal multiplexer, and works on most
+Linux, BSD, and Mac distributions.

misc/byobu/Makefile

@@ -0,0 +1,82 @@
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:14 wiz Exp $
+
+DISTNAME=	byobu_5.69.orig
+PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+CATEGORIES=	misc
+MASTER_SITES=	http://byobu.co/download/
+
+MAINTAINER=	ryoon@NetBSD.org
+HOMEPAGE=	http://byobu.co/download/
+COMMENT=	Open source text-based window manager and terminal multiplexer
+LICENSE=	gnu-gpl-v3
+
+WRKSRC=		${WRKDIR}/byobu-5.69
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	# none
+USE_TOOLS+=	automake bash:run perl
+
+REPLACE_BASH+=	usr/bin/*
+REPLACE_BASH+=	usr/lib/byobu/*
+REPLACE_BASH+=	usr/lib/byobu/include/*
+REPLACE_BASH+=	usr/share/byobu/tests/*
+
+REPLACE_PERL+=	usr/lib/byobu/include/*
+REPLACE_PYTHON+=	usr/lib/byobu/include/*
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-newt
+
+EGDIR=			share/examples/byobu
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${EGDIR}
+EGFILES+=		byobu/backend \
+			byobu/socketdir \
+			profile.d/Z97-byobu.sh
+# Keep empty directories
+MAKE_DIRS+=		${PKG_SYSCONFBASE}/byobu ${PKG_SYSCONFBASE}/profile.d
+.for i in ${EGFILES}
+CONF_FILES+=		${EGDIR}/${i} ${PKG_SYSCONFBASE}/${i}
+.endfor
+
+BYOBU_IN_FILES+=	usr/bin/byobu-config.in \
+			usr/bin/byobu-ctrl-a.in \
+			usr/bin/byobu-disable-prompt.in \
+			usr/bin/byobu-disable.in \
+			usr/bin/byobu-enable-prompt.in \
+			usr/bin/byobu-enable.in \
+			usr/bin/byobu-export.in \
+			usr/bin/byobu-janitor.in \
+			usr/bin/byobu-launch.in \
+			usr/bin/byobu-launcher-install.in \
+			usr/bin/byobu-launcher-uninstall.in \
+			usr/bin/byobu-launcher.in \
+			usr/bin/byobu-layout.in \
+			usr/bin/byobu-prompt.in \
+			usr/bin/byobu-quiet.in \
+			usr/bin/byobu-reconnect-sockets.in \
+			usr/bin/byobu-select-backend.in \
+			usr/bin/byobu-select-profile.in \
+			usr/bin/byobu-select-session.in \
+			usr/bin/byobu-shell.in \
+			usr/bin/byobu-silent.in \
+			usr/bin/byobu-status-detail.in \
+			usr/bin/byobu-status.in \
+			usr/bin/byobu-ugraph.in \
+			usr/bin/byobu-ulevel.in \
+			usr/bin/byobu.in \
+			etc/profile.d/Z97-byobu.sh.in \
+			usr/lib/byobu/include/dirs.in \
+			usr/lib/byobu/include/toggle-utf8.in \
+			usr/share/byobu/tests/byobu-time-notifications.in \
+			usr/lib/byobu/include/config.py.in
+
+post-extract:
+.for i in ${BYOBU_IN_FILES}
+	cd ${WRKSRC} && ${MV} ${i:S/.in$//} ${i}
+.endfor
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; automake -a --foreign -i; autoconf
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../lang/python/application.mk"
+.include "../../devel/py-newt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

misc/byobu/PLIST

@@ -0,0 +1,140 @@
+@comment $NetBSD: PLIST,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+bin/byobu
+bin/byobu-config
+bin/byobu-ctrl-a
+bin/byobu-disable
+bin/byobu-disable-prompt
+bin/byobu-enable
+bin/byobu-enable-prompt
+bin/byobu-export
+bin/byobu-janitor
+bin/byobu-keybindings
+bin/byobu-launch
+bin/byobu-launcher
+bin/byobu-launcher-install
+bin/byobu-launcher-uninstall
+bin/byobu-layout
+bin/byobu-prompt
+bin/byobu-quiet
+bin/byobu-reconnect-sockets
+bin/byobu-screen
+bin/byobu-select-backend
+bin/byobu-select-profile
+bin/byobu-select-session
+bin/byobu-shell
+bin/byobu-silent
+bin/byobu-status
+bin/byobu-status-detail
+bin/byobu-tmux
+bin/byobu-ugraph
+bin/byobu-ulevel
+lib/byobu/apport
+lib/byobu/arch
+lib/byobu/battery
+lib/byobu/color
+lib/byobu/cpu_count
+lib/byobu/cpu_freq
+lib/byobu/cpu_temp
+lib/byobu/custom
+lib/byobu/date
+lib/byobu/disk
+lib/byobu/disk_io
+lib/byobu/distro
+lib/byobu/ec2_cost
+lib/byobu/entropy
+lib/byobu/fan_speed
+lib/byobu/hostname
+lib/byobu/include/common
+lib/byobu/include/config.py
+lib/byobu/include/constants
+lib/byobu/include/cycle-status
+lib/byobu/include/dirs
+lib/byobu/include/ec2instancespricing.py
+lib/byobu/include/icons
+lib/byobu/include/mondrian
+lib/byobu/include/notify_osd
+lib/byobu/include/select-session.py
+lib/byobu/include/shutil
+lib/byobu/include/tmux-detach-all-but-current-client
+lib/byobu/include/toggle-utf8
+lib/byobu/ip_address
+lib/byobu/load_average
+lib/byobu/logo
+lib/byobu/mail
+lib/byobu/memory
+lib/byobu/menu
+lib/byobu/network
+lib/byobu/processes
+lib/byobu/raid
+lib/byobu/rcs_cost
+lib/byobu/reboot_required
+lib/byobu/release
+lib/byobu/services
+lib/byobu/session
+lib/byobu/swap
+lib/byobu/time
+lib/byobu/time_binary
+lib/byobu/time_utc
+lib/byobu/trash
+lib/byobu/updates_available
+lib/byobu/uptime
+lib/byobu/users
+lib/byobu/whoami
+lib/byobu/wifi_quality
+man/man1/byobu-config.1
+man/man1/byobu-ctrl-a.1
+man/man1/byobu-disable-prompt.1
+man/man1/byobu-disable.1
+man/man1/byobu-enable-prompt.1
+man/man1/byobu-enable.1
+man/man1/byobu-export.1
+man/man1/byobu-janitor.1
+man/man1/byobu-keybindings.1
+man/man1/byobu-launch.1
+man/man1/byobu-launcher-install.1
+man/man1/byobu-launcher-uninstall.1
+man/man1/byobu-launcher.1
+man/man1/byobu-layout.1
+man/man1/byobu-prompt.1
+man/man1/byobu-quiet.1
+man/man1/byobu-reconnect-sockets.1
+man/man1/byobu-screen.1
+man/man1/byobu-select-backend.1
+man/man1/byobu-select-profile.1
+man/man1/byobu-select-session.1
+man/man1/byobu-shell.1
+man/man1/byobu-silent.1
+man/man1/byobu-status-detail.1
+man/man1/byobu-status.1
+man/man1/byobu-tmux.1
+man/man1/byobu-ugraph.1
+man/man1/byobu-ulevel.1
+man/man1/byobu.1
+share/applications/byobu.desktop
+share/byobu/keybindings/common
+share/byobu/keybindings/f-keys
+share/byobu/keybindings/f-keys.screen
+share/byobu/keybindings/f-keys.screen.disable
+share/byobu/keybindings/f-keys.tmux
+share/byobu/keybindings/f-keys.tmux.disable
+share/byobu/keybindings/mouse.tmux.disable
+share/byobu/keybindings/mouse.tmux.enable
+share/byobu/keybindings/none
+share/byobu/keybindings/tmux-screen-keys.conf
+share/byobu/pixmaps/byobu.svg
+share/byobu/profiles/NONE
+share/byobu/profiles/bashrc
+share/byobu/profiles/byoburc
+share/byobu/profiles/common
+share/byobu/profiles/screenrc
+share/byobu/profiles/tmux
+share/byobu/profiles/tmuxrc
+share/byobu/status/status
+share/byobu/status/statusrc
+share/byobu/tests/byobu-time-notifications
+share/byobu/windows/common
+share/doc/byobu/help.screen.txt
+share/doc/byobu/help.tmux.txt
+share/examples/byobu/byobu/backend
+share/examples/byobu/byobu/socketdir
+share/examples/byobu/profile.d/Z97-byobu.sh

misc/byobu/distinfo

@@ -0,0 +1,37 @@
+$NetBSD: distinfo,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+SHA1 (byobu_5.69.orig.tar.gz) = 28823d25563e4356ac7dde7726d7dc68fb01ead8
+RMD160 (byobu_5.69.orig.tar.gz) = 27821ebd0fd4b83bc785005a1fd1971866962788
+Size (byobu_5.69.orig.tar.gz) = 635271 bytes
+SHA1 (patch-configure.ac) = 21cac29e1c4c2fed7c6829c344cbe0e63f587fef
+SHA1 (patch-etc_profile.d_Z97-byobu.sh.in) = ffcee02f275d8cc7ac3d0d68341732970ba6574f
+SHA1 (patch-usr_bin_byobu-config.in) = 6bb580db2ed61960a3c338a95d15522d194735c1
+SHA1 (patch-usr_bin_byobu-ctrl-a.in) = 8ff863de7d232f086c87120e8e159bdcf85165bc
+SHA1 (patch-usr_bin_byobu-disable-prompt.in) = 9e903639ab4611141d0172c1c514a3152559a198
+SHA1 (patch-usr_bin_byobu-disable.in) = f21719a475d5470a9297db8c7c418ee37a1ea473
+SHA1 (patch-usr_bin_byobu-enable-prompt.in) = c20bd9062e6b5edb4c4a397ffeabdebb1b5edd65
+SHA1 (patch-usr_bin_byobu-enable.in) = bd16e003838bab3e2738283bec99bf1d67ea7b2b
+SHA1 (patch-usr_bin_byobu-export.in) = 6ccc71f97b6e5c5577f561c099001e581a9100be
+SHA1 (patch-usr_bin_byobu-janitor.in) = 19b5839576984ff4521a487761d49e3abe989402
+SHA1 (patch-usr_bin_byobu-launch.in) = 0741804991233730f695ae5549bb2914897ba14a
+SHA1 (patch-usr_bin_byobu-launcher-install.in) = b9c22c556912f6661a4020788245bbd3c3a7ab3b
+SHA1 (patch-usr_bin_byobu-launcher-uninstall.in) = e91e4af5c34958a2c53d5a87b7807dfc27c4061f
+SHA1 (patch-usr_bin_byobu-launcher.in) = 7dcede2dafe7d811f91890dea437b8f6bb07a6cf
+SHA1 (patch-usr_bin_byobu-layout.in) = 390b69eb7d760d8a0cacd878e41c7d3a3e190219
+SHA1 (patch-usr_bin_byobu-prompt.in) = c4e2fbd007d0b01c1c7cd15ae661c5e84f269c5d
+SHA1 (patch-usr_bin_byobu-quiet.in) = 1f9f1eb6f60ad455c337794e53b45d9018d5d300
+SHA1 (patch-usr_bin_byobu-reconnect-sockets.in) = 54d1704528b6f571c905c485fdd9c5b5ba7589d7
+SHA1 (patch-usr_bin_byobu-select-backend.in) = aedd6141e8620725311fad63595d8049e5df03ec
+SHA1 (patch-usr_bin_byobu-select-profile.in) = 95267ce4fbaeb0f4af96155d6c651963216604d5
+SHA1 (patch-usr_bin_byobu-select-session.in) = 7d2eb8fdb1a1c0e5240f78cb2276a4ed817cbc82
+SHA1 (patch-usr_bin_byobu-shell.in) = 2bda6c565cbbe390101c7944f31c8cdf4eb78a72
+SHA1 (patch-usr_bin_byobu-silent.in) = 681e61b1b49f26f87c529bf9f5d6e737b1f4c909
+SHA1 (patch-usr_bin_byobu-status-detail.in) = 3213db863ffec32f58cff11e152ee28b55240998
+SHA1 (patch-usr_bin_byobu-status.in) = fcf9cdfb58d9cad79753d5c8b8e520356e4ac8e4
+SHA1 (patch-usr_bin_byobu-ugraph.in) = 6b035b71421504ec84f7a2d153fe39138c904d12
+SHA1 (patch-usr_bin_byobu-ulevel.in) = b8574cfc4f4b3e6e577dc962b3d5ec60c1d4f5b4
+SHA1 (patch-usr_bin_byobu.in) = 659043e79a14a65005fb9ad5a36666a237028a80
+SHA1 (patch-usr_lib_byobu_include_config.py.in) = 8a7f3f27473ea0bbd028a42074ba2275a293b102
+SHA1 (patch-usr_lib_byobu_include_dirs.in) = 13091758e7f86982ff304fd7a9771a94ed9af0b6
+SHA1 (patch-usr_lib_byobu_include_toggle-utf8.in) = 1ac7f90223605b1dc94995bc80fde102be83090d
+SHA1 (patch-usr_share_byobu_tests_byobu-time-notifications.in) = 553aa4db17d4d835a0df20541ffb6e50dce1d519

misc/byobu/patches/patch-configure.ac

@@ -0,0 +1,43 @@
+$NetBSD: patch-configure.ac,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- configure.ac.orig	2013-08-28 03:50:01.000000000 +0000
++++ configure.ac
+@@ -19,7 +19,38 @@ AC_PROG_LN_S
+ AC_OUTPUT(Makefile \
+ 	etc/byobu/Makefile \
+ 	etc/profile.d/Makefile \
++	etc/profile.d/Z97-byobu.sh
+ 	usr/share/applications/Makefile \
++	usr/bin/byobu
++	usr/bin/byobu-config
++	usr/bin/byobu-ctrl-a
++	usr/bin/byobu-disable
++	usr/bin/byobu-disable-prompt
++	usr/bin/byobu-enable
++	usr/bin/byobu-enable-prompt
++	usr/bin/byobu-export
++	usr/bin/byobu-janitor
++	usr/bin/byobu-launch
++	usr/bin/byobu-launcher
++	usr/bin/byobu-launcher-install
++	usr/bin/byobu-launcher-uninstall
++	usr/bin/byobu-layout
++	usr/bin/byobu-prompt
++	usr/bin/byobu-quiet
++	usr/bin/byobu-reconnect-sockets
++	usr/bin/byobu-select-backend
++	usr/bin/byobu-select-profile
++	usr/bin/byobu-select-session
++	usr/bin/byobu-shell
++	usr/bin/byobu-silent
++	usr/bin/byobu-status
++	usr/bin/byobu-status-detail
++	usr/bin/byobu-ugraph
++	usr/bin/byobu-ulevel
++	usr/lib/byobu/include/config.py
++	usr/lib/byobu/include/dirs
++	usr/lib/byobu/include/toggle-utf8
++	usr/share/byobu/tests/byobu-time-notifications
+ 	usr/share/byobu/keybindings/Makefile \
+ 	usr/share/byobu/pixmaps/Makefile \
+ 	usr/share/byobu/profiles/Makefile \

misc/byobu/patches/patch-etc_profile.d_Z97-byobu.sh.in

@@ -0,0 +1,29 @@
+$NetBSD: patch-etc_profile.d_Z97-byobu.sh.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- etc/profile.d/Z97-byobu.sh.in.orig	2013-10-18 20:25:32.000000000 +0000
++++ etc/profile.d/Z97-byobu.sh.in
+@@ -20,16 +20,16 @@
+ # Apologies for borrowing the LC_BYOBU namespace, but:
+ #  a) it's reasonable to assume that no one else is using LC_BYOBU
+ #  b) LC_* is sent and receieved by most /etc/ssh/ssh*_config
+-if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then
+-	. /usr/bin/byobu-launch
+-elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then
+-	. /usr/bin/byobu-launch
+-elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then
++if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then
++	. @prefix@/bin/byobu-launch
++elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
++	. @prefix@/bin/byobu-launch
++elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
+ 	export BYOBU_BACKEND="screen"
+-	. /usr/bin/byobu-launch
+-elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then
++	. @prefix@/bin/byobu-launch
++elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
+ 	export BYOBU_BACKEND="tmux"
+-	. /usr/bin/byobu-launch
++	. @prefix@/bin/byobu-launch
+ fi
+ 
+ # vi: syntax=sh ts=4 noexpandtab

misc/byobu/patches/patch-usr_bin_byobu-config.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-config.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-config.in.orig	2013-12-17 01:48:21.000000000 +0000
++++ usr/bin/byobu-config.in
+@@ -18,7 +18,7 @@
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ PKG="byobu"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py"

misc/byobu/patches/patch-usr_bin_byobu-ctrl-a.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-ctrl-a.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-ctrl-a.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-ctrl-a.in
+@@ -27,7 +27,7 @@ EOF
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ bind_to=""

misc/byobu/patches/patch-usr_bin_byobu-disable-prompt.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-disable-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-disable-prompt.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-disable-prompt.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ $BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc"

misc/byobu/patches/patch-usr_bin_byobu-disable.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-disable.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-disable.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-disable.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ byobu-launcher-uninstall

misc/byobu/patches/patch-usr_bin_byobu-enable-prompt.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-enable-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-enable-prompt.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-enable-prompt.in
+@@ -21,7 +21,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ 

misc/byobu/patches/patch-usr_bin_byobu-enable.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-enable.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-enable.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-enable.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ byobu-launcher-install

misc/byobu/patches/patch-usr_bin_byobu-export.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-export.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-export.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-export.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ gettext "

misc/byobu/patches/patch-usr_bin_byobu-janitor.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-janitor.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-janitor.in.orig	2013-11-01 19:44:12.000000000 +0000
++++ usr/bin/byobu-janitor.in
+@@ -21,7 +21,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ # Ensure that all updates get run immediately

misc/byobu/patches/patch-usr_bin_byobu-launch.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-launch.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-launch.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-launch.in
+@@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ]
+ 	BYOBU_SOURCED_PROFILE=1
+ 	PKG="byobu"
+ 	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 	# Ensure that autolaunch is not explicitly disabled
+ 	if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then

misc/byobu/patches/patch-usr_bin_byobu-launcher-install.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-launcher-install.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-launcher-install.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-launcher-install.in
+@@ -20,7 +20,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach"

misc/byobu/patches/patch-usr_bin_byobu-launcher-uninstall.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-launcher-uninstall.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-launcher-uninstall.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-launcher-uninstall.in
+@@ -20,7 +20,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ remove_launcher() {

misc/byobu/patches/patch-usr_bin_byobu-launcher.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-launcher.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-launcher.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-launcher.in
+@@ -22,7 +22,7 @@ PKG="byobu"
+ # ie, rather than "sudo byobu", you must run "sudo -H byobu"
+ if [ -O "$HOME" ]; then
+ 	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 	if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
+ 		false

misc/byobu/patches/patch-usr_bin_byobu-layout.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-layout.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-layout.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-layout.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ # Get the layouts directory

misc/byobu/patches/patch-usr_bin_byobu-prompt.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-prompt.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-prompt.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-prompt.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ echo

misc/byobu/patches/patch-usr_bin_byobu-quiet.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-quiet.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-quiet.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-quiet.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ FLAG="$BYOBU_CONFIG_DIR/status.disable"

misc/byobu/patches/patch-usr_bin_byobu-reconnect-sockets.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-reconnect-sockets.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-reconnect-sockets.in.orig	2013-11-01 19:49:07.000000000 +0000
++++ usr/bin/byobu-reconnect-sockets.in
+@@ -25,7 +25,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ case "$-" in

misc/byobu/patches/patch-usr_bin_byobu-select-backend.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-select-backend.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-select-backend.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-select-backend.in
+@@ -20,7 +20,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ usage () {

misc/byobu/patches/patch-usr_bin_byobu-select-profile.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-select-profile.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-select-profile.in.orig	2013-11-06 15:18:05.000000000 +0000
++++ usr/bin/byobu-select-profile.in
+@@ -24,7 +24,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ TEXTDOMAIN="$PKG"

misc/byobu/patches/patch-usr_bin_byobu-select-session.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-select-session.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-select-session.in.orig	2013-12-17 01:48:43.000000000 +0000
++++ usr/bin/byobu-select-session.in
+@@ -18,7 +18,7 @@
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ PKG="byobu"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py"

misc/byobu/patches/patch-usr_bin_byobu-shell.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-shell.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-shell.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-shell.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"

misc/byobu/patches/patch-usr_bin_byobu-silent.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-silent.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-silent.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-silent.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ FLAG="$BYOBU_CONFIG_DIR/status.disable"

misc/byobu/patches/patch-usr_bin_byobu-status-detail.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-status-detail.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-status-detail.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-status-detail.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ if which vim >/dev/null && `vim --version | grep -q +folding`; then

misc/byobu/patches/patch-usr_bin_byobu-status.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-status.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-status.in.orig	2013-11-01 20:40:43.000000000 +0000
++++ usr/bin/byobu-status.in
+@@ -20,7 +20,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ # Make sure status is not disabled

misc/byobu/patches/patch-usr_bin_byobu-ugraph.in

@@ -0,0 +1,22 @@
+$NetBSD: patch-usr_bin_byobu-ugraph.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-ugraph.in.orig	2013-12-17 02:04:48.000000000 +0000
++++ usr/bin/byobu-ugraph.in
+@@ -26,7 +26,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ script_name=${0##*/}
+@@ -81,7 +81,7 @@ Examples:
+   Trailing echo adds a required newline
+   Note no filename specified.
+ 
+-    $script_name "(/usr/lib/byobu/mem_used | sed -e 's/% //g';echo)"
++    $script_name "(@prefix@/lib/byobu/mem_used | sed -e 's/% //g';echo)"
+ 
+ 
+   Using $script_name just to rotate log and display the graph

misc/byobu/patches/patch-usr_bin_byobu-ulevel.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_bin_byobu-ulevel.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu-ulevel.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/bin/byobu-ulevel.in
+@@ -37,7 +37,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ circles_2=(○ ●)

misc/byobu/patches/patch-usr_bin_byobu.in

@@ -0,0 +1,21 @@
+$NetBSD: patch-usr_bin_byobu.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/bin/byobu.in.orig	2013-12-17 05:29:51.000000000 +0000
++++ usr/bin/byobu.in
+@@ -41,14 +41,14 @@ if [ -z "${BYOBU_PREFIX}" ]; then
+ 	# Find and export the installation location prefix
+ 	greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
+ 	prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))"
+-	if [ "$prefix" != "/usr" ]; then
++	if [ "$prefix" != "@prefix@" ]; then
+ 		echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"
+ 		. "$HOME/.byoburc"
+ 	fi
+ fi
+ export BYOBU_CHARMAP=$(locale charmap)
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ 
+ # Override backend if we can determine intentions from argv[0]

misc/byobu/patches/patch-usr_lib_byobu_include_config.py.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_lib_byobu_include_config.py.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/lib/byobu/include/config.py.in.orig	2013-12-06 13:39:33.000000000 +0000
++++ usr/lib/byobu/include/config.py.in
+@@ -52,7 +52,7 @@ BYOBU_CONFIG_DIR = os.getenv("BYOBU_CONF
+ BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu")
+ BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux")
+ BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen")
+-BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "/usr")
++BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "@prefix@")
+ SHARE = BYOBU_PREFIX + '/share/' + PKG
+ DOC = BYOBU_PREFIX + '/share/doc/' + PKG
+ if not os.path.exists(SHARE):

misc/byobu/patches/patch-usr_lib_byobu_include_dirs.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_lib_byobu_include_dirs.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/lib/byobu/include/dirs.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/lib/byobu/include/dirs.in
+@@ -22,7 +22,7 @@ PKG="byobu"
+ 
+ # Some users build and install byobu themselves, rather than from a distro
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr"
++[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@"
+ 
+ # Create and export the user configuration directory
+ if [ -d "$BYOBU_CONFIG_DIR" ]; then

misc/byobu/patches/patch-usr_lib_byobu_include_toggle-utf8.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_lib_byobu_include_toggle-utf8.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/lib/byobu/include/toggle-utf8.in.orig	2013-09-19 16:34:11.000000000 +0000
++++ usr/lib/byobu/include/toggle-utf8.in
+@@ -19,7 +19,7 @@
+ 
+ PKG="byobu"
+ [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
+-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
++[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+ . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
+ [ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc"
+ 

misc/byobu/patches/patch-usr_share_byobu_tests_byobu-time-notifications.in

@@ -0,0 +1,13 @@
+$NetBSD: patch-usr_share_byobu_tests_byobu-time-notifications.in,v 1.1 2014/01/01 07:15:58 ryoon Exp $
+
+--- usr/share/byobu/tests/byobu-time-notifications.in.orig	2013-08-28 03:50:01.000000000 +0000
++++ usr/share/byobu/tests/byobu-time-notifications.in
+@@ -21,7 +21,7 @@
+ 
+ PKG=byobu
+ RUNS=100
+-[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
++[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="@prefix@"
+ export BYOBU_PREFIX
+ 
+ loop() {

misc/calibre/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2013/06/06 12:54:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.66 2014/02/12 23:18:12 tron Exp $
 
 DISTNAME=	calibre-0.9.7
-PKGREVISION=	11
+PKGREVISION=	16
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
@@ -16,9 +15,7 @@ DEPENDS+=	help2man>=1.36.4:../../converters/help2man
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
-DEPENDS+=	${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
-DEPENDS+=	${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
@@ -30,9 +27,12 @@ DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
 
+PYTHON_VERSIONED_DEPENDENCIES=	dateutil dns
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config pax
 PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
 PYDISTUTILSPKG=	yes
 PYSETUPOPTARGS=	# empty
 PYSETUPINSTALLARGS=	--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
@@ -179,6 +179,7 @@ post-install:
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/chmlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12

misc/celestia/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/06/06 12:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2014/02/12 23:18:12 tron Exp $
 
-DISTNAME=	celestia-1.4.1
-PKGREVISION=	34
+DISTNAME=	celestia-1.6.1
+PKGREVISION=	2
 CATEGORIES=	misc x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=celestia/}
 
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-lua
 
 GCC_REQD+=		3.0
 CXXFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -40,6 +39,14 @@ CONFIGURE_ARGS+=	--disable-threading
 
 INSTALLATION_DIRS=	${EGDIR}
 
+
+# The distfile comes with binary static libs for cspice, liblua,
+# liblualib, and libpng. Delete them on the assumption that we don't
+# want to use binary blobs. If the build turns out to require them for
+# some reason, this can be reviewed...
+post-extract:
+	${RM} -f ${WRKSRC}/macosx/lib/*.a
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/celestia.cfg ${DESTDIR}${EGDIR}/celestia.cfg.default
 
@@ -50,7 +57,6 @@ post-install:
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

misc/celestia/PLIST

@@ -1,36 +1,74 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/10/27 21:21:26 dholland Exp $
 bin/celestia
 share/celestia/COPYING
+share/celestia/COPYING_bg
+share/celestia/COPYING_de
+share/celestia/COPYING_es
+share/celestia/COPYING_fr
+share/celestia/COPYING_gl
+share/celestia/COPYING_it
+share/celestia/COPYING_ja
+share/celestia/COPYING_ko
+share/celestia/COPYING_nl
+share/celestia/COPYING_pl
+share/celestia/COPYING_pt
+share/celestia/COPYING_pt_BR
+share/celestia/COPYING_ru
+share/celestia/COPYING_sv
+share/celestia/COPYING_uk
+share/celestia/COPYING_zh_CN
+share/celestia/COPYING_zh_TW
 share/celestia/controls.txt
+share/celestia/controls_be.txt
+share/celestia/controls_bg.txt
+share/celestia/controls_de.txt
+share/celestia/controls_es.txt
+share/celestia/controls_fr.txt
+share/celestia/controls_gl.txt
+share/celestia/controls_it.txt
+share/celestia/controls_ja.txt
+share/celestia/controls_ko.txt
+share/celestia/controls_nl.txt
+share/celestia/controls_no.txt
+share/celestia/controls_pl.txt
+share/celestia/controls_pt.txt
+share/celestia/controls_pt_BR.txt
+share/celestia/controls_ru.txt
+share/celestia/controls_sk.txt
+share/celestia/controls_sv.txt
+share/celestia/controls_uk.txt
+share/celestia/controls_zh_CN.txt
+share/celestia/controls_zh_TW.txt
 share/celestia/data/asterisms.dat
 share/celestia/data/asteroids.ssc
 share/celestia/data/boundaries.dat
-share/celestia/data/cassini.xyz
+share/celestia/data/charm2.stc
 share/celestia/data/comets.ssc
-share/celestia/data/deepsky.dsc
 share/celestia/data/earth_locs.ssc
 share/celestia/data/eros_locs.ssc
 share/celestia/data/extrasolar.ssc
 share/celestia/data/extrasolar.stc
-share/celestia/data/galileo.xyz
+share/celestia/data/galaxies.dsc
 share/celestia/data/gaspra_locs.ssc
+share/celestia/data/globulars.dsc
 share/celestia/data/hdxindex.dat
-share/celestia/data/huygens.xyz
 share/celestia/data/ida_locs.ssc
+share/celestia/data/itokawa_locs.ssc
 share/celestia/data/jupitermoons_locs.ssc
 share/celestia/data/mars_locs.ssc
 share/celestia/data/marsmoons_locs.ssc
 share/celestia/data/merc_locs.ssc
+share/celestia/data/minormoons.ssc
 share/celestia/data/moon_locs.ssc
 share/celestia/data/nearstars.stc
 share/celestia/data/neptunemoons_locs.ssc
+share/celestia/data/numberedmoons.ssc
 share/celestia/data/outersys.ssc
 share/celestia/data/revised.stc
 share/celestia/data/ring_locs.ssc
 share/celestia/data/saoxindex.dat
 share/celestia/data/saturnmoons_locs.ssc
 share/celestia/data/solarsys.ssc
-share/celestia/data/spacecraft.ssc
 share/celestia/data/spectbins.stc
 share/celestia/data/starnames.dat
 share/celestia/data/stars.dat
@@ -39,10 +77,82 @@ share/celestia/data/venus_locs.ssc
 share/celestia/data/visualbins.stc
 share/celestia/data/world-capitals.ssc
 share/celestia/demo.cel
+share/celestia/demo_be.cel
+share/celestia/demo_de.cel
+share/celestia/demo_es.cel
+share/celestia/demo_fr.cel
+share/celestia/demo_gl.cel
+share/celestia/demo_it.cel
+share/celestia/demo_ja.cel
+share/celestia/demo_ko.cel
+share/celestia/demo_lt.cel
+share/celestia/demo_lv.cel
+share/celestia/demo_nl.cel
+share/celestia/demo_no.cel
+share/celestia/demo_pl.cel
+share/celestia/demo_pt.cel
+share/celestia/demo_pt_BR.cel
+share/celestia/demo_ru.cel
+share/celestia/demo_sk.cel
+share/celestia/demo_sv.cel
+share/celestia/demo_tr.cel
+share/celestia/demo_uk.cel
+share/celestia/demo_zh_CN.cel
+share/celestia/demo_zh_TW.cel
+share/celestia/extras-standard/cassini/cassini.ssc
+share/celestia/extras-standard/cassini/data/cassini-cruise.xyzv
+share/celestia/extras-standard/cassini/data/cassini-orbit.xyzv
+share/celestia/extras-standard/cassini/data/cassini-solstice.xyzv
+share/celestia/extras-standard/cassini/data/huygens.xyzv
+share/celestia/extras-standard/cassini/models/cassini.3ds
+share/celestia/extras-standard/cassini/models/huygens.3ds
+share/celestia/extras-standard/galileo/data/galileo-cruise.xyzv
+share/celestia/extras-standard/galileo/data/galileo-orbit.xyzv
+share/celestia/extras-standard/galileo/galileo.ssc
+share/celestia/extras-standard/galileo/models/galileo.3ds
+share/celestia/extras-standard/hubble/hubble.ssc
+share/celestia/extras-standard/hubble/models/hubble.cmod
+share/celestia/extras-standard/iss/iss.ssc
+share/celestia/extras-standard/iss/models/iss.cmod
+share/celestia/extras-standard/iss/textures/medres/d_ring.jpg
+share/celestia/extras-standard/iss/textures/medres/graple.jpg
+share/celestia/extras-standard/iss/textures/medres/iss_dc.jpg
+share/celestia/extras-standard/iss/textures/medres/iss_dcs.jpg
+share/celestia/extras-standard/iss/textures/medres/iss_un.jpg
+share/celestia/extras-standard/iss/textures/medres/issb.jpg
+share/celestia/extras-standard/iss/textures/medres/issb2.jpg
+share/celestia/extras-standard/iss/textures/medres/issb3.jpg
+share/celestia/extras-standard/iss/textures/medres/issb4.jpg
+share/celestia/extras-standard/iss/textures/medres/issbs.jpg
+share/celestia/extras-standard/iss/textures/medres/issbso.jpg
+share/celestia/extras-standard/iss/textures/medres/issbso2.jpg
+share/celestia/extras-standard/iss/textures/medres/isscov2.jpg
+share/celestia/extras-standard/iss/textures/medres/isscover.jpg
+share/celestia/extras-standard/iss/textures/medres/isscup.jpg
+share/celestia/extras-standard/iss/textures/medres/issdish.jpg
+share/celestia/extras-standard/iss/textures/medres/issdot.jpg
+share/celestia/extras-standard/iss/textures/medres/issesa.jpg
+share/celestia/extras-standard/iss/textures/medres/isshand.jpg
+share/celestia/extras-standard/iss/textures/medres/issins.jpg
+share/celestia/extras-standard/iss/textures/medres/issku.jpg
+share/celestia/extras-standard/iss/textures/medres/issku1.jpg
+share/celestia/extras-standard/iss/textures/medres/issku2.jpg
+share/celestia/extras-standard/iss/textures/medres/issmb.jpg
+share/celestia/extras-standard/iss/textures/medres/issmod.jpg
+share/celestia/extras-standard/iss/textures/medres/issp2.jpg
+share/celestia/extras-standard/iss/textures/medres/isspanel.jpg
+share/celestia/extras-standard/iss/textures/medres/issrad.jpg
+share/celestia/extras-standard/iss/textures/medres/issred.jpg
+share/celestia/extras-standard/iss/textures/medres/isssolar.jpg
+share/celestia/extras-standard/iss/textures/medres/issusa.jpg
+share/celestia/extras-standard/iss/textures/medres/issusaf.jpg
+share/celestia/extras-standard/iss/textures/medres/isszmod.jpg
+share/celestia/extras-standard/iss/textures/medres/metalcon.jpg
+share/celestia/extras-standard/iss/textures/medres/nasda.jpg
+share/celestia/extras-standard/iss/textures/medres/questcov.jpg
+share/celestia/extras-standard/mir/mir.ssc
+share/celestia/extras-standard/mir/models/mir.3ds
 share/celestia/extras/apollo.ssc
-share/celestia/extras/comets.ssc
-share/celestia/extras/minormoons.ssc
-share/celestia/extras/numberedmoons.ssc
 share/celestia/extras/shroxclassic.ssc
 share/celestia/extras/shroxmars.ssc
 share/celestia/extras/skylab.ssc
@@ -60,54 +170,136 @@ share/celestia/fonts/helvbold18.txf
 share/celestia/fonts/helvbold24.txf
 share/celestia/fonts/sans10.txf
 share/celestia/fonts/sans12.txf
+share/celestia/fonts/sans12_be.txf
+share/celestia/fonts/sans12_bg.txf
+share/celestia/fonts/sans12_ja.txf
+share/celestia/fonts/sans12_ko.txf
+share/celestia/fonts/sans12_ru.txf
+share/celestia/fonts/sans12_uk.txf
+share/celestia/fonts/sans12_zh_CN.txf
+share/celestia/fonts/sans12_zh_TW.txf
 share/celestia/fonts/sans14.txf
+share/celestia/fonts/sans14_be.txf
+share/celestia/fonts/sans14_ja.txf
+share/celestia/fonts/sans14_ko.txf
+share/celestia/fonts/sans14_ru.txf
+share/celestia/fonts/sans14_uk.txf
+share/celestia/fonts/sans14_zh_CN.txf
+share/celestia/fonts/sans14_zh_TW.txf
 share/celestia/fonts/sans20.txf
 share/celestia/fonts/sansbold10.txf
 share/celestia/fonts/sansbold12.txf
 share/celestia/fonts/sansbold14.txf
 share/celestia/fonts/sansbold20.txf
+share/celestia/fonts/sansbold20_be.txf
+share/celestia/fonts/sansbold20_bg.txf
+share/celestia/fonts/sansbold20_ja.txf
+share/celestia/fonts/sansbold20_ko.txf
+share/celestia/fonts/sansbold20_ru.txf
+share/celestia/fonts/sansbold20_uk.txf
+share/celestia/fonts/sansbold20_zh_CN.txf
+share/celestia/fonts/sansbold20_zh_TW.txf
 share/celestia/guide.cel
-share/celestia/models/S0.pts
-share/celestia/models/SBa.pts
-share/celestia/models/SBb.pts
-share/celestia/models/SBc.pts
-share/celestia/models/Sa.pts
-share/celestia/models/Sb.pts
-share/celestia/models/Sc.pts
+share/celestia/guide_be.cel
+share/celestia/guide_bg.cel
+share/celestia/guide_de.cel
+share/celestia/guide_es.cel
+share/celestia/guide_fr.cel
+share/celestia/guide_gl.cel
+share/celestia/guide_it.cel
+share/celestia/guide_ja.cel
+share/celestia/guide_ko.cel
+share/celestia/guide_lt.cel
+share/celestia/guide_nl.cel
+share/celestia/guide_pl.cel
+share/celestia/guide_pt.cel
+share/celestia/guide_pt_BR.cel
+share/celestia/guide_ru.cel
+share/celestia/guide_sk.cel
+share/celestia/guide_sv.cel
+share/celestia/guide_uk.cel
+share/celestia/guide_zh_CN.cel
+share/celestia/guide_zh_TW.cel
+share/celestia/models/E0.png
+share/celestia/models/MilkyWay.png
+share/celestia/models/S0.png
+share/celestia/models/SBa.png
+share/celestia/models/SBb.png
+share/celestia/models/SBc.png
+share/celestia/models/Sa.png
+share/celestia/models/Sb.png
+share/celestia/models/Sc.png
+share/celestia/models/amalthea.3ds
 share/celestia/models/amalthea.cmod
+share/celestia/models/apollo.3ds
 share/celestia/models/asteroid.cms
+share/celestia/models/bacchus.3ds
 share/celestia/models/bacchus.cmod
 share/celestia/models/borrelly.cms
+share/celestia/models/castalia.3ds
 share/celestia/models/castalia.cmod
+share/celestia/models/deimos.3ds
 share/celestia/models/deimos.cmod
+share/celestia/models/epimetheus.3ds
 share/celestia/models/epimetheus.cmod
+share/celestia/models/eros.3ds
 share/celestia/models/eros.cmod
 share/celestia/models/eros.cms
+share/celestia/models/gaspra.3ds
 share/celestia/models/gaspra.cmod
+share/celestia/models/gemini.3ds
+share/celestia/models/geographos.3ds
 share/celestia/models/geographos.cmod
+share/celestia/models/golevka.3ds
 share/celestia/models/golevka.cmod
+share/celestia/models/halley.3ds
 share/celestia/models/halley.cmod
+share/celestia/models/hyperion.3ds
 share/celestia/models/hyperion.cmod
 share/celestia/models/hyperion.cms
+share/celestia/models/ida.3ds
 share/celestia/models/ida.cmod
+share/celestia/models/itokawa.cmod
+share/celestia/models/janus.3ds
 share/celestia/models/janus.cmod
+share/celestia/models/kleopatra.3ds
 share/celestia/models/kleopatra.cmod
+share/celestia/models/ky26.3ds
 share/celestia/models/ky26.cmod
+share/celestia/models/larissa.3ds
 share/celestia/models/larissa.cmod
+share/celestia/models/marsglobalsurvr.3ds
+share/celestia/models/marsodyssey.3ds
+share/celestia/models/mercury7.3ds
+share/celestia/models/pandora.3ds
 share/celestia/models/pandora.cmod
+share/celestia/models/phobos.3ds
 share/celestia/models/phobos.cmod
+share/celestia/models/phoebe.3ds
 share/celestia/models/phoebe.cmod
+share/celestia/models/prometheus.3ds
 share/celestia/models/prometheus.cmod
+share/celestia/models/proteus.3ds
 share/celestia/models/proteus.cmod
 share/celestia/models/proteus.cms
 share/celestia/models/roughsphere.cms
+share/celestia/models/skylab.3ds
+share/celestia/models/toutatis.3ds
 share/celestia/models/toutatis.cmod
+share/celestia/models/vesta.3ds
 share/celestia/models/vesta.cmod
+share/celestia/scripts/eclipticgrid.celx
+share/celestia/scripts/galacticgrid.celx
+share/celestia/scripts/horizontalgrid.celx
+share/celestia/scripts/mark-lg.celx
+share/celestia/scripts/z-dist.celx
 share/celestia/shaders/bumpdiffuse.vp
 share/celestia/shaders/bumpdiffuse_arb.vp
+share/celestia/shaders/bumpdiffuse_arb_hdr.vp
 share/celestia/shaders/bumpdiffuse_nv.fp
 share/celestia/shaders/bumphaze.vp
 share/celestia/shaders/bumphaze_arb.vp
+share/celestia/shaders/bumphaze_arb_hdr.vp
 share/celestia/shaders/diffuse.vp
 share/celestia/shaders/diffuse2_arb.vp
 share/celestia/shaders/diffuse_arb.vp
@@ -125,7 +317,9 @@ share/celestia/shaders/haze_arb.vp
 share/celestia/shaders/multishadow_arb.vp
 share/celestia/shaders/night.vp
 share/celestia/shaders/night2_arb.vp
+share/celestia/shaders/night2_arb_hdr.vp
 share/celestia/shaders/night_arb.vp
+share/celestia/shaders/night_arb_hdr.vp
 share/celestia/shaders/rings.vp
 share/celestia/shaders/rings_arb.vp
 share/celestia/shaders/ringshadow.vp
@@ -145,7 +339,40 @@ share/celestia/shaders/texphong_arb.vp
 share/celestia/shaders/texphong_nv.fp
 share/celestia/splash/splash.png
 share/celestia/start.cel
+share/celestia/start_be.cel
+share/celestia/start_bg.cel
+share/celestia/start_de.cel
+share/celestia/start_es.cel
+share/celestia/start_fr.cel
+share/celestia/start_gl.cel
+share/celestia/start_hu.cel
+share/celestia/start_it.cel
+share/celestia/start_ja.cel
+share/celestia/start_ko.cel
+share/celestia/start_lt.cel
+share/celestia/start_lv.cel
+share/celestia/start_nl.cel
+share/celestia/start_pl.cel
+share/celestia/start_pt.cel
+share/celestia/start_pt_BR.cel
+share/celestia/start_ru.cel
+share/celestia/start_sk.cel
+share/celestia/start_sv.cel
+share/celestia/start_uk.cel
+share/celestia/start_zh_CN.cel
+share/celestia/start_zh_TW.cel
 share/celestia/textures/flare.jpg
+share/celestia/textures/hires/dione.jpg
+share/celestia/textures/hires/enceladus.jpg
+share/celestia/textures/hires/iapetus.jpg
+share/celestia/textures/hires/mercury.jpg
+share/celestia/textures/hires/mimas.jpg
+share/celestia/textures/hires/moon.jpg
+share/celestia/textures/hires/moonbump.jpg
+share/celestia/textures/hires/phoebe.jpg
+share/celestia/textures/hires/rhea.jpg
+share/celestia/textures/hires/tethys.jpg
+share/celestia/textures/hires/titan.jpg
 share/celestia/textures/logo.png
 share/celestia/textures/lores/amalthea.jpg
 share/celestia/textures/lores/ariel-lok-mask.png
@@ -191,9 +418,7 @@ share/celestia/textures/lores/janus.jpg
 share/celestia/textures/lores/jupiter.jpg
 share/celestia/textures/lores/mars.jpg
 share/celestia/textures/lores/marsbump.jpg
-share/celestia/textures/lores/mercury-lok-mask.png
 share/celestia/textures/lores/mercury.jpg
-share/celestia/textures/lores/mimas-lok-mask.png
 share/celestia/textures/lores/mimas.jpg
 share/celestia/textures/lores/miranda-lok-mask.png
 share/celestia/textures/lores/miranda.jpg
@@ -262,10 +487,6 @@ share/celestia/textures/medres/hyperion.jpg
 share/celestia/textures/medres/iapetus.jpg
 share/celestia/textures/medres/idamosaic.jpg
 share/celestia/textures/medres/io.jpg
-share/celestia/textures/medres/iss-cap1.jpg
-share/celestia/textures/medres/iss-mc1.jpg
-share/celestia/textures/medres/iss-mc31.jpg
-share/celestia/textures/medres/iss-sol1.jpg
 share/celestia/textures/medres/janus.jpg
 share/celestia/textures/medres/jupiter.jpg
 share/celestia/textures/medres/mars.jpg
@@ -297,15 +518,58 @@ share/celestia/textures/medres/venuslike.jpg
 share/celestia/textures/medres/venuslikenight.jpg
 share/celestia/textures/medres/venussurface.jpg
 share/examples/celestia/celestia.cfg.default
+share/locale/ar/LC_MESSAGES/celestia.mo
+share/locale/ar/LC_MESSAGES/celestia_constellations.mo
+share/locale/be/LC_MESSAGES/celestia.mo
+share/locale/be/LC_MESSAGES/celestia_constellations.mo
+share/locale/bg/LC_MESSAGES/celestia.mo
+share/locale/bg/LC_MESSAGES/celestia_constellations.mo
 share/locale/de/LC_MESSAGES/celestia.mo
+share/locale/de/LC_MESSAGES/celestia_constellations.mo
 share/locale/el/LC_MESSAGES/celestia.mo
-share/locale/en/LC_MESSAGES/celestia.mo
+share/locale/el/LC_MESSAGES/celestia_constellations.mo
+share/locale/en/LC_MESSAGES/celestia_constellations.mo
 share/locale/es/LC_MESSAGES/celestia.mo
+share/locale/es/LC_MESSAGES/celestia_constellations.mo
 share/locale/fr/LC_MESSAGES/celestia.mo
+share/locale/fr/LC_MESSAGES/celestia_constellations.mo
 share/locale/gl/LC_MESSAGES/celestia.mo
+share/locale/gl/LC_MESSAGES/celestia_constellations.mo
 share/locale/hu/LC_MESSAGES/celestia.mo
+share/locale/hu/LC_MESSAGES/celestia_constellations.mo
 share/locale/it/LC_MESSAGES/celestia.mo
+share/locale/it/LC_MESSAGES/celestia_constellations.mo
+share/locale/ja/LC_MESSAGES/celestia.mo
+share/locale/ja/LC_MESSAGES/celestia_constellations.mo
+share/locale/ko/LC_MESSAGES/celestia.mo
+share/locale/ko/LC_MESSAGES/celestia_constellations.mo
+share/locale/lt/LC_MESSAGES/celestia.mo
+share/locale/lt/LC_MESSAGES/celestia_constellations.mo
+share/locale/lv/LC_MESSAGES/celestia.mo
+share/locale/lv/LC_MESSAGES/celestia_constellations.mo
 share/locale/nl/LC_MESSAGES/celestia.mo
+share/locale/nl/LC_MESSAGES/celestia_constellations.mo
+share/locale/no/LC_MESSAGES/celestia.mo
+share/locale/no/LC_MESSAGES/celestia_constellations.mo
+share/locale/pl/LC_MESSAGES/celestia.mo
+share/locale/pl/LC_MESSAGES/celestia_constellations.mo
 share/locale/pt/LC_MESSAGES/celestia.mo
-share/locale/pt_br/LC_MESSAGES/celestia.mo
+share/locale/pt/LC_MESSAGES/celestia_constellations.mo
+share/locale/pt_BR/LC_MESSAGES/celestia.mo
+share/locale/pt_BR/LC_MESSAGES/celestia_constellations.mo
+share/locale/ro/LC_MESSAGES/celestia.mo
+share/locale/ro/LC_MESSAGES/celestia_constellations.mo
 share/locale/ru/LC_MESSAGES/celestia.mo
+share/locale/ru/LC_MESSAGES/celestia_constellations.mo
+share/locale/sk/LC_MESSAGES/celestia.mo
+share/locale/sk/LC_MESSAGES/celestia_constellations.mo
+share/locale/sv/LC_MESSAGES/celestia.mo
+share/locale/sv/LC_MESSAGES/celestia_constellations.mo
+share/locale/tr/LC_MESSAGES/celestia.mo
+share/locale/tr/LC_MESSAGES/celestia_constellations.mo
+share/locale/uk/LC_MESSAGES/celestia.mo
+share/locale/uk/LC_MESSAGES/celestia_constellations.mo
+share/locale/zh_CN/LC_MESSAGES/celestia.mo
+share/locale/zh_CN/LC_MESSAGES/celestia_constellations.mo
+share/locale/zh_TW/LC_MESSAGES/celestia.mo
+share/locale/zh_TW/LC_MESSAGES/celestia_constellations.mo

misc/celestia/distinfo

@@ -1,30 +1,23 @@
-$NetBSD: distinfo,v 1.23 2013/02/17 09:39:09 dholland Exp $
+$NetBSD: distinfo,v 1.25 2013/11/08 21:15:47 joerg Exp $
 
-SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
-RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
-Size (celestia-1.4.1.tar.gz) = 23966886 bytes
-SHA1 (patch-aa) = 04bfea9e2a83a4c9fbd3917e378b5812699ccbe9
-SHA1 (patch-ab) = dae3c86ab56b5f9db11f6fc09184ebb4f7b1ec31
-SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90
-SHA1 (patch-ad) = 175d8df4eb58aa24c548ba14dee5c5ae1f240e41
-SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c
-SHA1 (patch-af) = 124f115719badb0d057cc324ac0455253e25022d
-SHA1 (patch-ag) = e5300a702a92f3f35f07b34726d80cd825c1a759
-SHA1 (patch-ah) = 0c4a61b1906095e258cdcc61c54d4174620986af
-SHA1 (patch-ai) = d5abfae0b4c4395572f22b6fdd1e7ad7bda4032f
+SHA1 (celestia-1.6.1.tar.gz) = 1f0fdf4525a8b9d6c708e1f6383babed670d18e7
+RMD160 (celestia-1.6.1.tar.gz) = 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a
+Size (celestia-1.6.1.tar.gz) = 52600436 bytes
+SHA1 (patch-aa) = 28ada3b952909b6b1aead358e0d9c5f481993982
+SHA1 (patch-ab) = cfd5d4e5aaa7b9bb907bbc291ee24e95c31ec716
+SHA1 (patch-ad) = ad98553f99041fc99470623e2bc1da5fa0f7036a
+SHA1 (patch-ae) = f789ceb6a6cba0cf2b488a655f7ddc9d370a5966
+SHA1 (patch-ah) = 6c13e05c799d1851d0c31145a8cfb40232d85e27
+SHA1 (patch-ai) = ff7b00d1d40e6bfa96c3dc0cc19beefb6c34badb
 SHA1 (patch-aj) = 7ce19f00912b1d56e1641b6c7c07910931709865
-SHA1 (patch-ak) = 8218d30082883dee4be13f5da3eabf74ebd949ec
-SHA1 (patch-al) = 1fff49adf00c67dfd99bd79700336fd3d6186e63
-SHA1 (patch-am) = 6cfa8ebc978ec35203613f26c3606ed1fb787b60
-SHA1 (patch-an) = 089ecfe539186f20191595c79bcf84cb37daffef
-SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
-SHA1 (patch-ap) = 81dece8ed5cc38442655865299cb302080a6acef
+SHA1 (patch-ak) = e9d9759d70bc5f4d4b90893ca29e8a9dba901aea
+SHA1 (patch-am) = 9d6be1a9b879fb2af30ac43011e4e554ec10f7b4
+SHA1 (patch-ap) = ceefba961e9467b9cac12f347740494a05efffe0
 SHA1 (patch-aq) = fdc7b7f0ff04672f93af144f41e09751b4de0c1a
-SHA1 (patch-src_celengine_console.cpp) = c837f465aa4c8ad67211d883af6157bcfa89dc55
-SHA1 (patch-src_celengine_galaxy.cpp) = 26cff89cb98757a1ea4f5d2727bacf76b82179cb
+SHA1 (patch-src_celengine_astro.cpp) = 0331128a2a01259958afd5e806a51d5b0e75769a
+SHA1 (patch-src_celengine_cmdparser.cpp) = b1c54d0b5c6af92606cdf9f23b73c1a8662a1acb
+SHA1 (patch-src_celengine_command.cpp) = 5f1466541f4153651425f597f45f852c93af8b7f
 SHA1 (patch-src_celengine_stardb.cpp) = 43d1998fcdd0116db43267b334533ec5fa3dfc72
 SHA1 (patch-src_celengine_texture.cpp) = eb60e81aab7097a3cb2481b052a3a9fe98bfb8e6
-SHA1 (patch-src_celengine_vecgl.h) = fbb6982731fdb7bd3561a091fe8c4910b55a4071
-SHA1 (patch-src_celestia_eclipsefinder.cpp) = 0ee3adf6dcf8393b8dbb708fad9d09d6fe9aaf5a
-SHA1 (patch-src_celestia_url.cpp) = 895af96b6476d528e7e87ec1fc7e81d41ff94ec0
-SHA1 (patch-src_celmath_mathlib.h) = 0a0ba369cc1a0593f36bad23cec1ba9200f3737e
+SHA1 (patch-src_celmath_intersect.h) = c39819abd757d4e36f0af473ae0807a447789ddf
+SHA1 (patch-src_celmath_mathlib.h) = 4974e116286664dbeb617eaee7d1823f8e565909

misc/celestia/options.mk

@@ -1,13 +1,21 @@
-# $NetBSD: options.mk,v 1.4 2009/07/22 09:01:36 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2013/10/30 06:22:26 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.celestia
-PKG_SUPPORTED_OPTIONS=		# empty
+PKG_SUPPORTED_OPTIONS=		lua
 PKG_OPTIONS_OPTIONAL_GROUPS=	gui
 PKG_OPTIONS_GROUP.gui=		glut gnome gtk kde
-PKG_SUGGESTED_OPTIONS=		gtk
+PKG_SUGGESTED_OPTIONS=		gtk lua
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=	--with-lua
+LUA_VERSIONS_INCOMPATIBLE=52
+.  include "../../lang/lua/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-lua
+.endif
+
 .if !empty(PKG_OPTIONS:Mglut)
 CONFIGURE_ARGS+=	--with-glut
 .  include "../../graphics/glut/buildlink3.mk"
@@ -17,6 +25,7 @@ CONFIGURE_ARGS+=	--with-glut
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SRC=		${PKGDIR}/PLIST.gtk
 .  include "../../graphics/gtkglext/buildlink3.mk"
+.  include "../../multimedia/libtheora/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
@@ -25,12 +34,14 @@ PLIST_SRC=		${PKGDIR}/PLIST.gtk
 .  include "../../devel/GConf/schemas.mk"
 .  include "../../devel/libgnomeui/buildlink3.mk"
 .  include "../../graphics/gtkglext/buildlink3.mk"
+.  include "../../multimedia/libtheora/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mkde)
 CONFIGURE_ARGS+=	--with-kde
 PLIST_SRC=		${PKGDIR}/PLIST.kde
 .  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.  include "../../multimedia/libtheora/buildlink3.mk"
 .  include "../../x11/kdelibs3/buildlink3.mk"
 .endif
 

misc/celestia/patches/patch-aa

@@ -1,19 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/01/26 04:25:46 markd Exp $
+$NetBSD: patch-aa,v 1.7 2013/10/27 21:21:26 dholland Exp $
 
---- configure.orig	2006-02-15 21:53:09.000000000 +0000
+--- configure.orig	2011-06-05 18:33:27.000000000 +0000
 +++ configure
-@@ -21716,8 +21716,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
- 
- 
- CELESTIA_CPPFLAGS=""
--CELESTIA_CFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations"
--CELESTIA_CXXFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations"
-+CELESTIA_CFLAGS="-Wall -ffast-math -fexpensive-optimizations"
-+CELESTIA_CXXFLAGS="-Wall -ffast-math -fexpensive-optimizations"
- 
- echo "$as_me:$LINENO: checking whether to include debugging code" >&5
- echo $ECHO_N "checking whether to include debugging code... $ECHO_C" >&6
-@@ -37346,19 +37346,19 @@ else
+@@ -26740,19 +26740,19 @@ if test "$kde_have_all_paths" = "no" && 
  if test "$ac_use_path_checking" = "default"; then
  
    if test -z "$kde_htmldir"; then
@@ -37,7 +26,7 @@ $NetBSD: patch-aa,v 1.6 2007/01/26 04:25:46 markd Exp $
    fi
    if test -z "$kde_locale"; then
      kde_locale='\${datadir}/locale'
-@@ -37367,31 +37367,31 @@ if test "$ac_use_path_checking" = "defau
+@@ -26761,31 +26761,31 @@ if test "$ac_use_path_checking" = "defau
      kde_cgidir='\${exec_prefix}/cgi-bin'
    fi
    if test -z "$kde_confdir"; then
@@ -77,12 +66,3 @@ $NetBSD: patch-aa,v 1.6 2007/01/26 04:25:46 markd Exp $
    fi
    if test -z "$kde_moduledir"; then
      if test "$kde_qtver" = "2"; then
-@@ -39509,7 +39509,7 @@ echo "$as_me:$LINENO: checking whether t
- echo $ECHO_N "checking whether to enable Celestia Extension Language... $ECHO_C" >&6
- if (test "$enable_lua" != "no"); then
- 	CXXFLAGS="$CXXFLAGS -DCELX"
--	LDFLAGS="$LDFLAGS -llualib -llua"
-+	LDFLAGS="$LDFLAGS -llua"
- 
- 	if (test "$lua_includes" != "no"); then
- 		CXXFLAGS="$CXXFLAGS -I$lua_includes"

misc/celestia/patches/patch-ab

@@ -1,19 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2013/10/27 21:21:26 dholland Exp $
 
 --- src/celutil/formatnum.cpp.orig	2006-02-13 14:33:02.000000000 +0000
 +++ src/celutil/formatnum.cpp
-@@ -7,8 +7,10 @@
- // as published by the Free Software Foundation; either version 2
- // of the License, or (at your option) any later version.
- 
-+#include <climits>
- #include <cmath>
- #include <cstdio>
-+#include <cstring>
- #include <string>
- #include "formatnum.h"
- 
-@@ -60,9 +62,9 @@ std::ostream& operator<<(std::ostream& o
+@@ -61,9 +61,9 @@ std::ostream& operator<<(std::ostream& o
      char buf[32];
      char obuf[64];
      double value = num.getRoundedValue();

misc/celestia/patches/patch-ac

@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/02/17 23:46:39 adam Exp $
-
---- config.h.in.orig	2006-02-15 22:53:21.000000000 +0100
-+++ config.h.in
-@@ -248,7 +248,7 @@ int res_init(void);
- 
- 
- 
--#if !defined(HAVE_STRLCAT_PROTO)
-+#if !defined(HAVE_STRLCAT_PROTO) && defined(KDELIBSUFF)
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -260,7 +260,7 @@ unsigned long strlcat(char*, const char*
- 
- 
- 
--#if !defined(HAVE_STRLCPY_PROTO)
-+#if !defined(HAVE_STRLCPY_PROTO) && defined(KDELIBSUFF)
- #ifdef __cplusplus
- extern "C" {
- #endif

misc/celestia/patches/patch-ad

@@ -1,85 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2006/12/13 16:45:42 obache Exp $
+$NetBSD: patch-ad,v 1.5 2013/10/27 21:21:26 dholland Exp $
 
---- src/celestia/celestiacore.cpp.orig	2006-02-08 09:03:15.000000000 +0000
+Honor PKG_SYSCONFDIR.
+
+--- src/celestia/celestiacore.cpp.orig	2011-06-05 16:11:13.000000000 +0000
 +++ src/celestia/celestiacore.cpp
-@@ -2577,16 +2577,16 @@ static void displayAngle(Overlay& overla
- 
-     if (degrees > 0)
-     {
--        overlay.printf("%d%s %02d' %.1f\"",
-+        overlay.myprintf("%d%s %02d' %.1f\"",
-                         degrees, UTF8_DEGREE_SIGN, minutes, seconds);
-     }
-     else if (minutes > 0)
-     {
--        overlay.printf("%02d' %.1f\"", minutes, seconds);
-+        overlay.myprintf("%02d' %.1f\"", minutes, seconds);
-     }
-     else
-     {
--        overlay.printf("%.1f\"", seconds);
-+        overlay.myprintf("%.1f\"", seconds);
-     }
- }
- 
-@@ -2625,7 +2625,7 @@ static void displayApparentMagnitude(Ove
-         overlay << _("Absolute magnitude: ");
-     }
- 
--    overlay.printf("%.1f\n", appMag);
-+    overlay.myprintf("%.1f\n", appMag);
- }
- 
- static void displayAcronym(Overlay& overlay, char* s)
-@@ -2665,7 +2665,7 @@ static void displayStarInfo(Overlay& ove
-         return;
-     }
- 
--    overlay.printf(_("Abs (app) mag: %.2f (%.2f)\n"),
-+    overlay.myprintf(_("Abs (app) mag: %.2f (%.2f)\n"),
-                    star.getAbsoluteMagnitude(),
-                    astro::absToAppMag(star.getAbsoluteMagnitude(),
-                                       (float) distance));
-@@ -2687,7 +2687,7 @@ static void displayStarInfo(Overlay& ove
-     if (detail > 1)
-     {
-         overlay << _("Surface temp: ") << SigDigitNum(star.getTemperature(), 3) << " K\n";
--        overlay.printf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f);
-+        overlay.myprintf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f);
- 
-         overlay << _("Rotation period: ");
-         float period = star.getRotationElements().period;
-@@ -2782,7 +2782,7 @@ static void displayPlanetInfo(Overlay& o
-             float appMag = body.getApparentMagnitude(*sun,
-                                                      bodyPos - Point3d(0, 0, 0),
-                                                      viewVec);
--            overlay.printf(_("Apparent mag: %.2f\n"), appMag);
-+            overlay.myprintf(_("Apparent mag: %.2f\n"), appMag);
- #endif
-         }
-     }
-@@ -3140,9 +3140,9 @@ void CelestiaCore::renderOverlay()
- 
-         // Field of view
-         float fov = radToDeg(sim->getActiveObserver()->getFOV());
--        overlay->printf(_("FOV: "));
-+        overlay->myprintf(_("FOV: "));
-         displayAngle(*overlay, fov);
--        overlay->printf(" (%.2f%s)\n", views[activeView]->zoom,
-+        overlay->myprintf(" (%.2f%s)\n", views[activeView]->zoom,
-                         UTF8_MULTIPLICATION_SIGN);
-         overlay->endText();
-         glPopMatrix();
-@@ -3341,7 +3341,7 @@ void CelestiaCore::renderOverlay()
-             movieCapture->getFrameRate();
-         int min = (int) (sec / 60);
-         sec -= min * 60.0f;
--        overlay->printf("%3d:%05.2f", min, sec);
-+        overlay->myprintf("%3d:%05.2f", min, sec);
-         glPopMatrix();
- 
-         glPushMatrix();
-@@ -3547,7 +3547,7 @@ bool CelestiaCore::initSimulation(const 
+@@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const 
      }
      else
      {

misc/celestia/patches/patch-ae

@@ -1,21 +1,24 @@
-$NetBSD: patch-ae,v 1.4 2006/02/17 23:46:40 adam Exp $
+$NetBSD: patch-ae,v 1.5 2013/10/27 21:21:26 dholland Exp $
 
---- Makefile.in.orig	2006-02-15 22:53:42.000000000 +0100
+- handle celestia.cfg using the pkgsrc method for config files
+- don't use mv -b, which isn't standard
+
+--- Makefile.in.orig	2011-06-05 18:34:26.000000000 +0000
 +++ Makefile.in
-@@ -307,7 +307,6 @@ noinst_DATA = \
- 
+@@ -444,7 +444,6 @@ noinst_DATA = \
+ 	$(dosstuff)
  
  pkgdata_DATA = \
 -	celestia.cfg \
  	controls.txt \
  	COPYING \
  	$(wildcard *.cel)
-@@ -848,7 +847,7 @@ dist-hook:
+@@ -1064,7 +1063,7 @@ dist-hook:
  
  install-data-hook:
- 	if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
--		mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
-+		mv -f $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
- 		rmdir $(kde_datadir)/@PACKAGE@ ; \
+ 	if [ "$(kde_datadir)" -a -d $(DESTDIR)/$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)/$(kde_datadir)/@PACKAGE@ ] ; then \
+-		mv -f -b $(DESTDIR)/$(kde_datadir)/@PACKAGE@/* $(DESTDIR)/$(datadir)/@PACKAGE@/ ; \
++		mv -f $(DESTDIR)/$(kde_datadir)/@PACKAGE@/* $(DESTDIR)/$(datadir)/@PACKAGE@/ ; \
+ 		rmdir $(DESTDIR)/$(kde_datadir)/@PACKAGE@ ; \
  	fi
- 	if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
+ 	if [ "$(kde_datadir)" -a ! -h $(DESTDIR)/$(kde_datadir)/@PACKAGE@ ] ; then \

misc/celestia/patches/patch-af

@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/08/14 22:43:08 wiz Exp $
-
---- src/celengine/star.h.orig	2005-12-06 17:30:23.000000000 +0000
-+++ src/celengine/star.h
-@@ -30,7 +30,7 @@ class StarDetails
-     // orbits and StarDetails objects.  Currently, it's assumed that they
-     // have lifetimes that continue until program termination.
-  public:
--    StarDetails::StarDetails();
-+    StarDetails();
- 
-     inline float getRadius() const;
-     inline float getTemperature() const;

misc/celestia/patches/patch-ag

@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/08/14 22:43:08 wiz Exp $
-
---- src/celengine/command.h.orig	2004-12-22 22:07:15.000000000 +0000
-+++ src/celengine/command.h
-@@ -94,7 +94,7 @@ class CommandGoto : public Instantaneous
- class CommandGotoLongLat : public InstantaneousCommand
- {
-  public:
--    CommandGotoLongLat::CommandGotoLongLat(double t,
-+    CommandGotoLongLat(double t,
-                                            double dist,
-                                            float _longitude, float _latitude,
-                                            Vec3f _up);

misc/celestia/patches/patch-ah

@@ -1,29 +1,12 @@
-$NetBSD: patch-ah,v 1.5 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-ah,v 1.6 2013/10/27 21:21:26 dholland Exp $
 
---- src/celutil/util.h.orig	2005-08-15 20:34:43.000000000 +0000
+--- src/celutil/util.h.orig	2011-06-05 16:11:15.000000000 +0000
 +++ src/celutil/util.h
-@@ -12,22 +12,16 @@
- #ifndef _UTIL_H_
- #define _UTIL_H_
+@@ -12,6 +12,7 @@
+ #ifndef _CELUTIL_UTIL_H_
+ #define _CELUTIL_UTIL_H_
  
 +#include <algorithm>
  #include <string>
  #include <vector>
  #include <iostream>
- #include <functional>
- 
--#ifndef min
--#define min(a, b) ((a) < (b) ? (a) : (b))
--#endif
--
--#ifndef max
--#define max(a, b) ((a) < (b) ? (b) : (a))
--#endif
--				      
- #ifdef _WIN32
- #define _(s) s
- #else
-+#include <libintl.h>
- #define _(s) gettext(s)
- #endif
- 

misc/celestia/patches/patch-ai

@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2006/08/14 22:43:08 wiz Exp $
+$NetBSD: patch-ai,v 1.4 2013/10/27 21:21:26 dholland Exp $
 
---- src/celestia/celx.cpp.orig	2006-01-07 00:01:51.000000000 +0000
+--- src/celestia/celx.cpp.orig	2011-06-05 16:11:13.000000000 +0000
 +++ src/celestia/celx.cpp
-@@ -368,6 +368,18 @@ static CelestiaCore* getAppCore(lua_Stat
+@@ -492,6 +492,18 @@ static CelestiaCore* getAppCore(lua_Stat
      return appCore;
  }
  
@@ -21,44 +21,12 @@ $NetBSD: patch-ai,v 1.3 2006/08/14 22:43:08 wiz Exp $
  
  LuaState::LuaState() :
      timeout(MaxTimeslice),
-@@ -378,7 +390,7 @@ LuaState::LuaState() :
-     scriptAwakenTime(0.1),
-     ioMode(NoIO)
+@@ -503,7 +515,7 @@ LuaState::LuaState() :
+     ioMode(NoIO),
+     eventHandlerEnabled(false)
  {
 -    state = lua_open();
 +    state = lua_newstate(l_alloc, NULL);
      timer = CreateTimer();
      screenshotCount = 0;
  }
-@@ -472,6 +484,7 @@ void LuaState::cleanup()
- }
- 
- 
-+
- bool LuaState::createThread()
- {
-     // Initialize the coroutine which wraps the script
-@@ -598,7 +611,7 @@ bool LuaState::charEntered(const char* c
-         int stackTop = lua_gettop(costate);
-         if (strcmp(c_p, "y") == 0)
-         {
--            lua_iolibopen(costate);
-+            luaopen_io(costate);
-             ioMode = IOAllowed;
-         }
-         else
-@@ -4577,10 +4590,10 @@ bool LuaState::init(CelestiaCore* appCor
-     initMaps();
- 
-     // Import the base and math libraries
--    lua_baselibopen(state);
--    lua_mathlibopen(state);
--    lua_tablibopen(state);
--    lua_strlibopen(state);
-+    luaopen_base(state);
-+    luaopen_math(state);
-+    luaopen_table(state);
-+    luaopen_string(state);
- 
-     // Add an easy to use wait function, so that script writers can
-     // live in ignorance of coroutines.  There will probably be a significant

misc/celestia/patches/patch-ak

@@ -1,16 +1,35 @@
-$NetBSD: patch-ak,v 1.2 2012/07/03 17:40:36 joerg Exp $
+$NetBSD: patch-ak,v 1.3 2013/10/27 21:21:26 dholland Exp $
 
---- src/celestia/Makefile.in.orig	2006-02-15 21:53:43.000000000 +0000
+- fix locale directory
+- use libintl where needed
+
+--- src/celestia/Makefile.in.orig	2011-06-05 18:34:28.000000000 +0000
 +++ src/celestia/Makefile.in
-@@ -298,9 +298,9 @@ SUBDIRS = res $(am__append_1) $(am__appe
- bin_PROGRAMS = celestia
+@@ -213,7 +213,7 @@ DCOPIDL = @DCOPIDL@
+ DCOPIDL2CPP = @DCOPIDL2CPP@
+ DCOPIDLNG = @DCOPIDLNG@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+-DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@
++DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(localedir)"' @DEFS@
+ DEPDIR = @DEPDIR@
+ DL_LIBS = @DL_LIBS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -474,7 +474,7 @@ xdg_menudir = @xdg_menudir@
+ SUBDIRS = res $(am__append_1) $(am__append_2)
  INCLUDES = -I..
- 
--localedir = $(datadir)/locale
-+localedir = /usr/pkg/share/locale
  @ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
--@ENABLE_KDE_TRUE@                  $(LIBSOCKET) kde/libkdegui.a
-+@ENABLE_KDE_TRUE@                  $(LIBSOCKET) $(LIBINTL) kde/libkdegui.a
+-@ENABLE_KDE_TRUE@                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
++@ENABLE_KDE_TRUE@                  $(LIBSOCKET) $(LIBINTL) -lDCOP kde/libkdegui.a
  
  @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- @ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a
+ @ENABLE_GTK_TRUE@celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
+@@ -538,7 +538,8 @@ celestia_LDADD = \
+ 	../cel3ds/libcel3ds.a \
+ 	../celmath/libcelmath.a \
+ 	../celutil/libcelutil.a \
+-	$(SPICE_LIBS)
++	$(SPICE_LIBS) \
++	$(INTLLIBS)
+ 
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia

misc/celestia/patches/patch-al

@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2012/07/03 17:40:36 joerg Exp $
-
---- src/celestia/kde/doc/celestia/Makefile.in.orig	2006-02-15 21:53:43.000000000 +0000
-+++ src/celestia/kde/doc/celestia/Makefile.in
-@@ -642,7 +642,7 @@ install-docs: docs-am install-nls
- 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/; \
- 	fi
- 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
--	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
-+	$(LN_S) $(kde_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
- 
- uninstall-docs:
- 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/celestia

misc/celestia/patches/patch-am

@@ -1,32 +1,60 @@
-$NetBSD: patch-am,v 1.2 2012/07/03 17:40:36 joerg Exp $
+$NetBSD: patch-am,v 1.3 2013/10/27 21:21:26 dholland Exp $
 
---- src/celutil/unixdirectory.cpp.orig	2005-03-05 13:56:14.000000000 +0000
+- dragonfly doesn't have wordexp.h
+- use glob.h instead of wordexp.h when not using wordexp.h
+
+--- src/celutil/unixdirectory.cpp.orig	2011-06-05 16:11:15.000000000 +0000
 +++ src/celutil/unixdirectory.cpp
-@@ -7,11 +7,19 @@
- // as published by the Free Software Foundation; either version 2
- // of the License, or (at your option) any later version.
+@@ -11,20 +11,30 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <dirent.h>
+-#include <wordexp.h>
+-#include "directory.h"
+-
+-using namespace std;
  
 +#if defined(__DragonFly__)
 +#define NO_WORDEXP
 +#endif
+ 
+ #ifdef TARGET_OS_MAC
+ #ifdef QT_CORE_LIB
+ // Crash on Mac OS X / Qt4 version when calling wordfree.
+ // This seems to happen only with Leopard.
+-#define WORDEXP_PROBLEM
++#define NO_WORDEXP
++#endif
+ #endif
 +
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
 +#ifdef NO_WORDEXP
 +#include <glob.h>
 +#else
- #include <wordexp.h>
-+#endif
- #include "directory.h"
++#include <wordexp.h>
+ #endif
  
- using namespace std;
-@@ -98,6 +106,19 @@ bool IsDirectory(const std::string& file
- }
++#include "directory.h"
++
++using namespace std;
++
++
+ class UnixDirectory : public Directory
+ {
+ public:
+@@ -107,7 +117,7 @@ bool IsDirectory(const std::string& file
  
- std::string WordExp(const std::string& filename) {
-+#ifdef NO_WORDEXP
+ std::string WordExp(const std::string& filename) 
+ {
+-#ifndef WORDEXP_PROBLEM   
++#ifndef NO_WORDEXP
+     wordexp_t result;
+     std::string expanded;
+ 
+@@ -130,7 +140,17 @@ std::string WordExp(const std::string& f
+     expanded = result.we_wordv[0];
+     wordfree(&result);
+ #else
+-    std::string expanded = filename;
 +    glob_t g;
 +    std::string expanded;
 +    glob(filename.c_str(), GLOB_NOSORT | GLOB_TILDE, NULL, &g);
@@ -38,13 +66,6 @@ $NetBSD: patch-am,v 1.2 2012/07/03 17:40:36 joerg Exp $
 +	globfree(&g);
 +	return expanded;
 +    }
-+#else
-     wordexp_t result;
-     std::string expanded;
- 
-@@ -121,4 +142,5 @@ std::string WordExp(const std::string& f
-     wordfree(&result);
- 
+ #endif
      return expanded;
-+#endif
  }

misc/celestia/patches/patch-an

@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.2 2011/11/25 22:08:30 joerg Exp $
-
---- src/celengine/overlay.cpp.orig	2005-07-19 20:30:54.000000000 +0000
-+++ src/celengine/overlay.cpp
-@@ -9,6 +9,7 @@
- 
- #include <cstdarg>
- #include <cstdio>
-+#include <cstring>
- #include <celutil/utf8.h>
- #include "gl.h"
- #include "vecgl.h"
-@@ -173,7 +174,7 @@ void Overlay::print(char* s)
- }
- 
- 
--void Overlay::printf(const char* format, ...)
-+void Overlay::myprintf(const char* format, ...)
- {
-     va_list args;
-     va_start(args, format);

misc/celestia/patches/patch-ao

@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/12/13 16:45:42 obache Exp $
-
---- src/celengine/overlay.h.orig	2004-01-03 20:30:42.000000000 +0000
-+++ src/celengine/overlay.h
-@@ -63,7 +63,7 @@ class Overlay : public std::ostream
-     void print(wchar_t);
-     void print(char);
-     void print(char*);
--    void printf(const char*, ...);
-+    void myprintf(const char*, ...);
-     
- 
-  private:

misc/celestia/patches/patch-ap

@@ -1,10 +1,11 @@
-$NetBSD: patch-ap,v 1.3 2013/02/17 09:39:09 dholland Exp $
+$NetBSD: patch-ap,v 1.4 2013/10/27 21:21:26 dholland Exp $
 
 https://sourceforge.net/tracker/?func=detail&aid=3018741&group_id=21302&atid=121302
+(there's a leftover bit apparently missed upstream)
 
 Also, add <cstring> to fix build with png 1.6.
 
---- src/celengine/image.cpp.orig	2005-07-19 20:30:54.000000000 +0000
+--- src/celengine/image.cpp.orig	2011-06-05 16:11:09.000000000 +0000
 +++ src/celengine/image.cpp
 @@ -7,6 +7,7 @@
  // as published by the Free Software Foundation; either version 2
@@ -13,7 +14,7 @@ Also, add <cstring> to fix build with png 1.6.
 +#include <cstring>
  #include <fstream>
  
- #ifndef MACOSX
+ #ifndef TARGET_OS_MAC
 @@ -78,7 +79,7 @@ using namespace std;
  // Define various expansion transformations for old versions of libpng
  #if PNG_LIBPNG_VER < 10004
@@ -23,12 +24,3 @@ Also, add <cstring> to fix build with png 1.6.
  #define png_set_tRNS_to_alpha(p)   png_set_expand(p)
  #endif // PNG_LIBPNG_VER < 10004
  
-@@ -720,7 +721,7 @@ Image* LoadPNGImage(const string& filena
- 
-     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-     {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))

misc/celestia/patches/patch-src_celengine_astro.cpp

@@ -0,0 +1,16 @@
+$NetBSD: patch-src_celengine_astro.cpp,v 1.1 2013/10/27 21:21:26 dholland Exp $
+
+Handle a tzname incompatibility between BSD and Linux.
+
+--- src/celengine/astro.cpp~	2011-06-05 16:11:09.000000000 +0000
++++ src/celengine/astro.cpp
+@@ -522,7 +522,8 @@ const char* astro::Date::toCStr(Format f
+     cal_time.tm_sec = (int)seconds;
+     cal_time.tm_wday = wday;
+     cal_time.tm_gmtoff = utc_offset;
+-#if defined(TARGET_OS_MAC) || defined(__FreeBSD__)
++#if defined(TARGET_OS_MAC) || defined(__FreeBSD__) || defined(__NetBSD__) || \
++	defined(__OpenBSD__) || defined(__DragonFly__)
+     // tm_zone is a non-const string field on the Mac and FreeBSD (why?)
+     cal_time.tm_zone = const_cast<char*>(tzname.c_str());
+ #else

misc/celestia/patches/patch-src_celengine_cmdparser.cpp

@@ -0,0 +1,53 @@
+$NetBSD: patch-src_celengine_cmdparser.cpp,v 1.1 2013/10/27 21:21:26 dholland Exp $
+
+Fix build with lua switched off.
+(This is probably not the right place to switch it off, but it does
+build this way.)
+
+--- src/celengine/cmdparser.cpp~	2011-06-05 16:11:09.000000000 +0000
++++ src/celengine/cmdparser.cpp
+@@ -797,10 +797,14 @@ int parseRenderFlags(string s)
+         {
+             string name = tokenizer.getNameValue();
+ 
++#ifdef CELX
+             if (CelxLua::RenderFlagMap.count(name) == 0)
+                 cerr << "Unknown render flag: " << name << "\n";
+             else
+                 flags |= CelxLua::RenderFlagMap[name];
++#else
++	    cerr << "Unknown render flag: " << name << "\n";
++#endif
+ 
+             ttype = tokenizer.nextToken();
+             if (ttype == Tokenizer::TokenBar)
+@@ -826,10 +830,14 @@ int parseLabelFlags(string s)
+         {
+             string name = tokenizer.getNameValue();
+ 
++#ifdef CELX
+             if (CelxLua::LabelFlagMap.count(name) == 0)
+                 cerr << "Unknown label flag: " << name << "\n";
+             else
+                 flags |= CelxLua::LabelFlagMap[name];
++#else
++	    cerr << "Unknown label flag: " << name << "\n";
++#endif
+ 
+             ttype = tokenizer.nextToken();
+             if (ttype == Tokenizer::TokenBar)
+@@ -856,10 +864,14 @@ int parseOrbitFlags(string s)
+             string name = tokenizer.getNameValue();
+             name[0] = toupper(name[0]);
+ 
++#ifdef CELX
+             if (CelxLua::BodyTypeMap.count(name) == 0)
+                 cerr << "Unknown orbit flag: " << name << "\n";
+             else
+                 flags |= CelxLua::BodyTypeMap[name];
++#else
++	    cerr << "Unknown orbit flag: " << name << "\n";
++#endif
+ 
+             ttype = tokenizer.nextToken();
+             if (ttype == Tokenizer::TokenBar)

misc/celestia/patches/patch-src_celengine_command.cpp

@@ -0,0 +1,109 @@
+$NetBSD: patch-src_celengine_command.cpp,v 1.1 2013/10/27 21:21:26 dholland Exp $
+
+Fix build with lua switched off.
+(This is probably not the right place to switch it off, but it does
+build this way.)
+
+--- src/celengine/command.cpp~	2013-10-27 20:32:16.000000000 +0000
++++ src/celengine/command.cpp
+@@ -11,7 +11,9 @@
+ #include <celutil/util.h>
+ #include <celestia/celestiacore.h>
+ #include <celestia/imagecapture.h>
++#ifdef CELX
+ #include <celestia/celx_internal.h>
++#endif
+ #include "astro.h"
+ #include "command.h"
+ #include "execution.h"
+@@ -773,6 +775,7 @@ CommandSplitView::CommandSplitView(unsig
+ 
+ void CommandSplitView::process(ExecutionEnvironment& env)
+ {
++#ifdef CELX
+     vector<Observer*> observer_list;
+     getObservers(env.getCelestiaCore(), observer_list);
+ 
+@@ -785,6 +786,7 @@ void CommandSplitView::process(Execution
+         View::Type type = (compareIgnoringCase(splitType, "h") == 0) ? View::HorizontalSplit : View::VerticalSplit;
+         env.getCelestiaCore()->splitView(type, view, (float)splitPos);
+     }
++#endif
+ }
+ 
+ 
+@@ -796,6 +800,7 @@ CommandDeleteView::CommandDeleteView(uns
+ 
+ void CommandDeleteView::process(ExecutionEnvironment& env)
+ {
++#ifdef CELX
+     vector<Observer*> observer_list;
+     getObservers(env.getCelestiaCore(), observer_list);
+ 
+@@ -807,6 +810,7 @@ void CommandDeleteView::process(Executio
+         View* view = getViewByObserver(env.getCelestiaCore(), obs);
+         env.getCelestiaCore()->deleteView(view);
+     }
++#endif
+ }
+ 
+ 
+@@ -817,8 +823,10 @@ CommandSingleView::CommandSingleView()
+ 
+ void CommandSingleView::process(ExecutionEnvironment& env)
+ {
++#ifdef CELX
+     View* view = getViewByObserver(env.getCelestiaCore(), env.getSimulation()->getActiveObserver());
+     env.getCelestiaCore()->singleView(view);
++#endif
+ }
+ 
+ 
+@@ -834,6 +840,7 @@ CommandSetActiveView::CommandSetActiveVi
+ 
+ void CommandSetActiveView::process(ExecutionEnvironment& env)
+ {
++#ifdef CELX
+     vector<Observer*> observer_list;
+     getObservers(env.getCelestiaCore(), observer_list);
+ 
+@@ -843,6 +850,7 @@ void CommandSetActiveView::process(Execu
+         View* view = getViewByObserver(env.getCelestiaCore(), obs);
+         env.getCelestiaCore()->setActiveView(view);
+     }
++#endif
+ }
+ 
+ 
+@@ -892,6 +900,7 @@ CommandSetLineColor::CommandSetLineColor
+ 
+ void CommandSetLineColor::process(ExecutionEnvironment& /* env */)
+ {
++#ifdef CELX
+     if (CelxLua::LineColorMap.count(item) == 0)
+     {
+         cerr << "Unknown line style: " << item << "\n";
+@@ -900,6 +909,7 @@ void CommandSetLineColor::process(Execut
+     {
+         *CelxLua::LineColorMap[item] = color;
+     }
++#endif
+ }
+ 
+ 
+@@ -914,6 +924,7 @@ CommandSetLabelColor::CommandSetLabelCol
+ 
+ void CommandSetLabelColor::process(ExecutionEnvironment& /* env */)
+ {
++#ifdef CELX
+     if (CelxLua::LabelColorMap.count(item) == 0)
+     {
+         cerr << "Unknown label style: " << item << "\n";
+@@ -922,6 +933,7 @@ void CommandSetLabelColor::process(Execu
+     {
+         *CelxLua::LabelColorMap[item] = color;
+     }
++#endif
+ }
+ 
+ 

misc/celestia/patches/patch-src_celengine_console.cpp

@@ -1,12 +0,0 @@
-$NetBSD: patch-src_celengine_console.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
-
---- src/celengine/console.cpp.orig	2005-07-19 20:30:54.000000000 +0000
-+++ src/celengine/console.cpp
-@@ -9,6 +9,7 @@
- 
- #include <cstdarg>
- #include <cstdio>
-+#include <cstring>
- #include <cassert>
- #include "celutil/utf8.h"
- #include "gl.h"

misc/celestia/patches/patch-src_celengine_galaxy.cpp

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_celengine_galaxy.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
-
---- src/celengine/galaxy.cpp.orig	2005-12-05 05:42:43.000000000 +0000
-+++ src/celengine/galaxy.cpp
-@@ -311,8 +311,8 @@ void Galaxy::renderGalaxyEllipsoid(const
-     float discSizeInPixels = pixelSize * getRadius() / offset.length();
-     unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f);
-     unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f);
--    nRings = max(nRings, 100);
--    nSlices = max(nSlices, 100);
-+    nRings = max(nRings, 100U);
-+    nSlices = max(nSlices, 100U);
- 
-     VertexProcessor* vproc = context.getVertexProcessor();
-     if (vproc == NULL)

misc/celestia/patches/patch-src_celengine_vecgl.h

@@ -1,48 +0,0 @@
-$NetBSD: patch-src_celengine_vecgl.h,v 1.1 2012/07/03 17:40:36 joerg Exp $
-
---- src/celengine/vecgl.h.orig	2012-07-03 14:48:42.000000000 +0000
-+++ src/celengine/vecgl.h
-@@ -89,17 +89,20 @@ inline void glScale(const Vec3f& v)
- 
- inline void glLightDirection(GLenum light, const Vec3f& dir)
- {
--    glLightfv(light, GL_POSITION, &(Vec4f(dir.x, dir.y, dir.z, 0.0f).x));
-+    Vec4f t(dir.x, dir.y, dir.z, 0.0f);
-+    glLightfv(light, GL_POSITION, &t.x);
- }
- 
- inline void glLightPosition(GLenum light, const Point3f& pos)
- {
--    glLightfv(light, GL_POSITION, &(Vec4f(pos.x, pos.y, pos.z, 1.0f).x));
-+    Vec4f t(pos.x, pos.y, pos.z, 1.0f);
-+    glLightfv(light, GL_POSITION, &t.x);
- }
- 
- inline void glLightColor(GLenum light, GLenum which, const Vec3f& color)
- {
--    glLightfv(light, which, &(Vec4f(color.x, color.y, color.z, 1.0f).x));
-+    Vec4f t(color.x, color.y, color.z, 1.0f);
-+    glLightfv(light, which, &t.x);
- }
- 
- inline void glLightColor(GLenum light, GLenum which, const Vec4f& color)
-@@ -109,15 +112,15 @@ inline void glLightColor(GLenum light, G
- 
- inline void glLightColor(GLenum light, GLenum which, const Color& color)
- {
-+    Vec4f t(color.red(), color.green(), color.blue(), color.alpha());
-     glLightfv(light, which,
--              &(Vec4f(color.red(), color.green(), color.blue(), color.alpha()).x));
-+              &t.x);
- }
- 
- inline void glAmbientLightColor(const Color& color)
- {
--    glLightModelfv(GL_LIGHT_MODEL_AMBIENT,
--                   &(Vec4f(color.red(), color.green(), color.blue(),
--                           color.alpha()).x));
-+    Vec4f t(color.red(), color.green(), color.blue(), color.alpha());
-+    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &t.x);
- }
- 
- #endif // _VECGL_H_

misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp

@@ -1,12 +0,0 @@
-$NetBSD: patch-src_celestia_eclipsefinder.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
-
---- src/celestia/eclipsefinder.cpp.orig	2004-09-09 06:34:50.000000000 +0000
-+++ src/celestia/eclipsefinder.cpp
-@@ -10,6 +10,7 @@
- // as published by the Free Software Foundation; either version 2
- // of the License, or (at your option) any later version.
- 
-+#include <cstring>
- #include <string>
- #include <sstream>
- #include <algorithm>

misc/celestia/patches/patch-src_celestia_url.cpp

@@ -1,12 +0,0 @@
-$NetBSD: patch-src_celestia_url.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
-
---- src/celestia/url.cpp.orig	2005-11-18 08:00:39.000000000 +0000
-+++ src/celestia/url.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstring>
- #include <string>
- #include <stdio.h>
- #include "celestiacore.h"

misc/celestia/patches/patch-src_celmath_intersect.h

@@ -0,0 +1,12 @@
+$NetBSD: patch-src_celmath_intersect.h,v 1.1 2013/11/08 21:15:47 joerg Exp $
+
+--- src/celmath/intersect.h.orig	2013-11-07 14:03:35.000000000 +0000
++++ src/celmath/intersect.h
+@@ -12,6 +12,7 @@
+ #ifndef _CELMATH_INTERSECT_H_
+ #define _CELMATH_INTERSECT_H_
+ 
++#include "mathlib.h"
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"

misc/celestia/patches/patch-src_celmath_mathlib.h

@@ -1,9 +1,9 @@
-$NetBSD: patch-src_celmath_mathlib.h,v 1.2 2012/07/03 17:40:36 joerg Exp $
+$NetBSD: patch-src_celmath_mathlib.h,v 1.3 2013/10/27 21:21:26 dholland Exp $
 
---- src/celmath/mathlib.h.orig	2002-03-12 04:58:25.000000000 +0000
+--- src/celmath/mathlib.h.orig	2011-06-05 16:11:15.000000000 +0000
 +++ src/celmath/mathlib.h
 @@ -11,7 +11,7 @@
- #define _MATHLIB_H_
+ #define _CELMATH_MATHLIB_H_
  
  #include <cmath>
 -#include <stdlib.h>

misc/chipmunk/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 09:57:17 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:26 ryoon Exp $
 #
 
 DISTNAME=	chipmunk-1.4
@@ -21,5 +21,5 @@ INSTALLATION_DIRS=	sbin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${DESTDIR}${PREFIX}/sbin/chipmunk
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

misc/colorls/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/04/06 03:45:17 rodent Exp $
+# $NetBSD: Makefile,v 1.28 2013/09/12 11:15:12 jperkin Exp $
 
 DISTNAME=	ls
 PKGNAME=	colorls-2.2
@@ -12,6 +12,7 @@ COMMENT=	Uses color with ls(1) to display file attributes
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_FEATURES+=		fts_open
+USE_TOOLS=		nroff
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 

misc/colorls/distinfo

@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2012/03/01 17:22:38 hans Exp $
+$NetBSD: distinfo,v 1.9 2013/09/10 14:24:20 joerg Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
 Size (ls.tar.gz) = 11768 bytes
 SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
 SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
-SHA1 (patch-ac) = cccd6669acec44b9efc2e7c8992fd2905371885f
+SHA1 (patch-ac) = c96de4d9964055ca0244cecbc5ed2249ce2aa803
 SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
-SHA1 (patch-ae) = f901c10b02f9a965e10603a2d0365f0439b00e65
+SHA1 (patch-ae) = f217206de7b35bf03db4b95040f26bdf850b7cb7
 SHA1 (patch-extern.h) = ecb2f17ab8f17a42f744c26a86d243d90b309fd5
 SHA1 (patch-stat__flags.c) = 2def9b687a3c81611543875b5e99f86a65183680

misc/colorls/patches/patch-ac

@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2012/03/01 16:25:16 hans Exp $
+$NetBSD: patch-ac,v 1.6 2013/09/10 14:24:20 joerg Exp $
 
 --- ls.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ ls.c
@@ -148,6 +148,15 @@ $NetBSD: patch-ac,v 1.5 2012/03/01 16:25:16 hans Exp $
  				cur->fts_pointer = np;
  			}
  		}
+@@ -500,7 +535,7 @@ display(p, list)
+ 		d.s_inode = strlen(buf);
+ 		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
+ 		d.s_nlink = strlen(buf);
+-		(void)snprintf(buf, sizeof(buf), "%qu", maxsize);
++		(void)snprintf(buf, sizeof(buf), "%llu", (long long)maxsize);
+ 		d.s_size = strlen(buf);
+ 		d.s_user = maxuser;
+ 	}
 @@ -521,7 +556,11 @@ display(p, list)
   */
  static int

misc/colorls/patches/patch-ae

@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2013/09/10 14:24:20 joerg Exp $
 
 --- print.c.orig	1996-12-21 23:40:58.000000000 +0000
 +++ print.c
@@ -37,7 +37,31 @@ $NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
  void
  printscol(dp)
  	DISPLAY *dp;
-@@ -124,10 +145,14 @@ printlong(dp)
+@@ -97,8 +118,8 @@ printlong(dp)
+ 		if (f_inode)
+ 			(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
+ 		if (f_size)
+-			(void)printf("%*qd ",
+-			    dp->s_block, howmany(sp->st_blocks, blocksize));
++			(void)printf("%*lld ",
++			    dp->s_block, (long long)howmany(sp->st_blocks, blocksize));
+ 		(void)strmode(sp->st_mode, buf);
+ 		np = p->fts_pointer;
+ 		(void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
+@@ -114,20 +135,24 @@ printlong(dp)
+ 				(void)printf("%3d, %3d ",
+ 				    major(sp->st_rdev), minor(sp->st_rdev));
+ 		else if (dp->bcfile)
+-			(void)printf("%*s%*qd ",
+-			    8 - dp->s_size, "", dp->s_size, sp->st_size);
++			(void)printf("%*s%*lld ",
++			    8 - dp->s_size, "", dp->s_size, (long long)sp->st_size);
+ 		else
+-			(void)printf("%*qd ", dp->s_size, sp->st_size);
++			(void)printf("%*lld ", dp->s_size, (long long)sp->st_size);
+ 		if (f_accesstime)
+ 			printtime(sp->st_atime);
+ 		else if (f_statustime)
  			printtime(sp->st_ctime);
  		else
  			printtime(sp->st_mtime);
@@ -80,10 +104,14 @@ $NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
  			endcol += colwidth;
  		}
  		(void)putchar('\n');
-@@ -219,9 +256,13 @@ printaname(p, inodefield, sizefield)
+@@ -217,11 +254,15 @@ printaname(p, inodefield, sizefield)
+ 	if (f_inode)
+ 		chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
  	if (f_size)
- 		chcnt += printf("%*qd ",
- 		    (int)sizefield, howmany(sp->st_blocks, blocksize));
+-		chcnt += printf("%*qd ",
+-		    (int)sizefield, howmany(sp->st_blocks, blocksize));
++		chcnt += printf("%*lld ",
++		    (int)sizefield, (long long)howmany(sp->st_blocks, blocksize));
 +	if (f_color)
 +		(void)colortype(sp->st_mode);
  	chcnt += printf("%s", p->fts_name);

misc/deskbar-applet/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2013/06/06 12:54:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.84 2014/02/12 23:18:12 tron Exp $
 
 DISTNAME=	deskbar-applet-2.32.0
-PKGREVISION=	26
+PKGREVISION=	32
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +20,9 @@ PKGCONFIG_OVERRIDE=	data/deskbar-applet.pc.in
 
 GCONF_SCHEMAS=		deskbar-applet.schemas
 
-PYTHON_PATCH_SCRIPTS=		deskbar/deskbar-applet.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2, py-gtk2
+
+REPLACE_PYTHON=		deskbar/deskbar-applet.py
 PY_PATCHPLIST=			yes
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0

misc/dialog/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2013/05/26 17:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2014/03/09 12:11:13 roy Exp $
 
-DISTNAME=	dialog-1.2-20130523
+DISTNAME=	dialog-1.2-20140219
 PKGNAME=	${DISTNAME:C/-2/.2/}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://invisible-island.net/dialog/
 EXTRACT_SUFX=	.tgz
@@ -28,5 +29,5 @@ SUBST_MESSAGE.rpath=	Fixing rpath in dialog-config
 SUBST_SED.rpath=	-e 's;-L\(.\);${_COMPILER_RPATH_FLAG}\1\{exec_prefix\}/lib -L\1;'
 SUBST_STAGE.rpath=	pre-configure
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

misc/dialog/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.34 2013/05/26 17:58:39 wiz Exp $
+$NetBSD: distinfo,v 1.38 2014/02/24 12:13:48 wiz Exp $
 
-SHA1 (dialog-1.2-20130523.tgz) = 54768b8443af3de2e6cd16073ec666f19d4ded7a
-RMD160 (dialog-1.2-20130523.tgz) = d1ff2ad4b7911021784faafda42a433f07c2d150
-Size (dialog-1.2-20130523.tgz) = 432886 bytes
+SHA1 (dialog-1.2-20140219.tgz) = 50b70508254afe678265eed28654e629853649b1
+RMD160 (dialog-1.2-20140219.tgz) = 6169714d860516dbebd67a99b16f01df34525312
+Size (dialog-1.2-20140219.tgz) = 453535 bytes

misc/dirdiff/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 09:57:19 asau Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/20 19:20:08 joerg Exp $
 #
 
 DISTNAME=	dirdiff-2.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc tk
 MASTER_SITES=	http://samba.org/ftp/paulus/
 
@@ -16,5 +16,9 @@ DEPENDS+=	tk>=8.3.4:../../x11/tk
 
 USE_LIBTOOL=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+CFLAGS+=	-DUSE_INTERP_RESULT
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

misc/dirdiff/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/08 11:43:06 obache Exp $
+$NetBSD: distinfo,v 1.5 2014/01/20 19:20:08 joerg Exp $
 
 SHA1 (dirdiff-2.1.tar.gz) = baa355b2eae4886de57a47cb69d8214c7545c0e8
 RMD160 (dirdiff-2.1.tar.gz) = 280ead77db4371eee2d6cc6d5df3ee362585fbb0
 Size (dirdiff-2.1.tar.gz) = 43105 bytes
-SHA1 (patch-aa) = 3d82bc63fe30b8c4eed2a84571d56f769d93a56a
+SHA1 (patch-aa) = 03b27f19ec415638ae02813e2a02ec139be27719
+SHA1 (patch-filecmp.c) = dd56255289746eacc4804d11f2fb1880c9272411

misc/dirdiff/patches/patch-aa

@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/07/24 08:42:30 agc Exp $
+$NetBSD: patch-aa,v 1.3 2014/01/20 19:20:08 joerg Exp $
 
 --- Makefile	2003/07/24 07:02:17	1.1
 +++ Makefile	2003/07/24 07:03:14
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/24 08:42:30 agc Exp $
  
  # You may need to change the -I arguments depending on your system
 -CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
-+CFLAGS=-O3 -I${PREFIX}/include
++CFLAGS+=-I${PREFIX}/include
  
 -all:	libfilecmp.so.0.0
 +LIBS=	libfilecmp.a

misc/dirdiff/patches/patch-filecmp.c

@@ -0,0 +1,12 @@
+$NetBSD: patch-filecmp.c,v 1.1 2014/01/20 19:20:08 joerg Exp $
+
+--- filecmp.c.orig	2014-01-20 17:20:35.000000000 +0000
++++ filecmp.c
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <tcl.h>
++#include <unistd.h>
+ #include <sys/fcntl.h>
+ 
+ #define BSIZE		32768

misc/dnetc/DESCR

@@ -1,11 +0,0 @@
-distributed.net believes in the capability and potential of
-distributed computing. Their mission consists of three interdependent
-goals: development, deployment, and advocacy, to be pursued in the
-advancement of distributed computing.
-
-They advocate distributed computing, by encouraging global
-participation and contributions of processing power, bandwidth,
-and expertise; by providing a forum for discussion; and by raising
-awareness on the Internet and in the mainstream.
-
-Current Projects: RC5-72, and Optimal 25 Mark Golomb Rulers.

misc/dnetc/Makefile

@@ -1,82 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 09:57:19 asau Exp $
-
-DISTNAME=	${DISTNAME_${OPSYS}_${MACHINE_ARCH}}
-PKGNAME=	dnetc-2.${DISTVER_${OPSYS}_${MACHINE_ARCH}}
-CATEGORIES=	misc
-MASTER_SITES=	http://http.distributed.net/pub/dcti/current-client/ \
-		ftp://ftp.distributed.net/pub/dcti/current-client/
-
-MAINTAINER=	shaun@inerd.com
-HOMEPAGE=	http://www.distributed.net/
-COMMENT=	Official distributed.net client
-
-ONLY_FOR_PLATFORM=	Darwin-*-powerpc NetBSD-*-alpha NetBSD-*-arm	\
-			NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k	\
-			NetBSD-*-mipsel NetBSD-*-powerpc NetBSD-*-sparc \
-			NetBSD-*-sparc64 NetBSD-*-vax SunOS-*-sparc	\
-			SunOS-*-sparc64
-
-USE_TOOLS+=	gtar
-NO_BUILD=	YES
-
-DISTNAME_Darwin_powerpc=	dnetc-macosx-ppc
-DISTNAME_NetBSD_m68k=		dnetc-netbsd-m68k-elf
-DISTNAME_NetBSD_alpha=		dnetc-netbsd-alpha-elf
-DISTNAME_NetBSD_arm=		dnetc-netbsd-arm32
-DISTNAME_NetBSD_arm32=		dnetc-netbsd-arm32
-DISTNAME_NetBSD_i386=		dnetc-netbsd-x86-elf
-DISTNAME_NetBSD_mipsel=		dnetc-netbsd-mipsel-elf
-DISTNAME_NetBSD_powerpc=	dnetc-netbsd-ppc
-DISTNAME_NetBSD_sparc=		dnetc-netbsd-sparc-elf
-DISTNAME_NetBSD_sparc64=	dnetc-netbsd-sparc64-elf
-DISTNAME_NetBSD_vax=		dnetc-netbsd-vax
-DISTNAME_SunOS_sparc=		dnetc-solaris26-sparc32
-DISTNAME_SunOS_sparc64=		dnetc-solaris7-sparc64
-
-DISTVER_Darwin_powerpc=		9012.497
-DISTVER_NetBSD_m68k=		9005.483
-DISTVER_NetBSD_alpha=		9003.481
-DISTVER_NetBSD_arm=		9001.478
-DISTVER_NetBSD_arm32=		${DISTVER_NetBSD_arm}
-DISTVER_NetBSD_i386=		9008.492
-DISTVER_NetBSD_mipsel=		9006.485
-DISTVER_NetBSD_powerpc=		9008.492
-DISTVER_NetBSD_sparc=		9001.478
-DISTVER_NetBSD_sparc64=		9004.482
-DISTVER_NetBSD_vax=		9008.492
-DISTVER_SunOS_sparc=		9009.494
-DISTVER_SunOS_sparc64=		9009.494
-
-# wonkolicious macro expansion:
-WRKSRC=${WRKDIR}/${DISTNAME:S/dnetc/dnetc${DISTVER_${OPSYS}_${MACHINE_ARCH}:E}/1}
-
-RCD_SCRIPTS=	dnetc
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "arm32"
-do-extract:
-	cd ${WRKDIR} && ${GTAR} -zxf ${DISTDIR}/${DISTFILES:Q}
-.endif
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/dnetc/
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" \
-    || ${MACHINE_ARCH} == "sparc"
-	${INSTALL_DATA} ${WRKSRC}/readme.* ${DESTDIR}${PREFIX}/share/doc/dnetc/
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/dnetc/
-.else
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/dnetc/
-.endif
-	${INSTALL_MAN} ${WRKSRC}/dnetc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_PROGRAM} ${WRKSRC}/dnetc ${DESTDIR}${PREFIX}/bin/
-
-.if defined(PKG_DEVELOPER) && defined(ALL_DISTFILES)
-all-distfiles:
-.	undef DISTFILES
-.	for platform in ${ONLY_FOR_PLATFORM}
-DISTFILES+=	${DISTNAME_${platform:C/-\*-/_/}}${EXTRACT_SUFX}
-.	endfor
-.endif
-
-.include "../../mk/bsd.pkg.mk"

misc/dnetc/PLIST

@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:07:19 joerg Exp $
-bin/dnetc
-man/man1/dnetc.1
-share/doc/dnetc/CHANGES.txt
-share/doc/dnetc/dnetc.txt
-share/doc/dnetc/readme.1st
-share/doc/dnetc/readme._ix
-share/examples/rc.d/dnetc

misc/dnetc/distinfo

@@ -1,38 +0,0 @@
-$NetBSD: distinfo,v 1.8 2006/09/06 20:38:57 wiz Exp $
-
-SHA1 (dnetc-macosx-ppc.tar.gz) = 3b0dbf859dfdb8a43eec02417f850e3e3439a7d2
-RMD160 (dnetc-macosx-ppc.tar.gz) = 4799b43e12c804c9beb02b117aceb33f2ba99ec7
-Size (dnetc-macosx-ppc.tar.gz) = 199996 bytes
-SHA1 (dnetc-netbsd-alpha-elf.tar.gz) = ebddc524ccbbd9d72031a036ceb320a60c4a9059
-RMD160 (dnetc-netbsd-alpha-elf.tar.gz) = 4e87d2b4c801dc27462be646bc5a0d2986a41a49
-Size (dnetc-netbsd-alpha-elf.tar.gz) = 446179 bytes
-SHA1 (dnetc-netbsd-arm32.tar.gz) = da5f79ea1bc84a1e3a7a5a36c9e77e38ae6f477e
-RMD160 (dnetc-netbsd-arm32.tar.gz) = b45e011fdd0ba86144169f6225a0b6fa7f5665f1
-Size (dnetc-netbsd-arm32.tar.gz) = 190196 bytes
-SHA1 (dnetc-netbsd-m68k-elf.tar.gz) = ca56b4160589c5d979aa84743d5c2ff01db92741
-RMD160 (dnetc-netbsd-m68k-elf.tar.gz) = c7e0fa757624c7467ca8181fce4384ef66cc531f
-Size (dnetc-netbsd-m68k-elf.tar.gz) = 309059 bytes
-SHA1 (dnetc-netbsd-mipsel-elf.tar.gz) = b36de8e26db1c26422f42e80bd65a5e5c3b69531
-RMD160 (dnetc-netbsd-mipsel-elf.tar.gz) = f2206df952213f69f1f32860104bef5584a41031
-Size (dnetc-netbsd-mipsel-elf.tar.gz) = 356877 bytes
-SHA1 (dnetc-netbsd-ppc.tar.gz) = 8357eb4f9cf421313eb606b97542e17c916bcf2b
-RMD160 (dnetc-netbsd-ppc.tar.gz) = 5e0a90ffe424d13922c372445310db10a387b662
-Size (dnetc-netbsd-ppc.tar.gz) = 361974 bytes
-SHA1 (dnetc-netbsd-sparc-elf.tar.gz) = b67f38b83dfef47d86a8e9d3f14da3a8cf55f3e5
-RMD160 (dnetc-netbsd-sparc-elf.tar.gz) = afe3c9df0b75aece36913034df608aa6552d20e3
-Size (dnetc-netbsd-sparc-elf.tar.gz) = 351309 bytes
-SHA1 (dnetc-netbsd-sparc64-elf.tar.gz) = ea9aa72ef8cadd85e8d0e81cdb47f2b9abde1441
-RMD160 (dnetc-netbsd-sparc64-elf.tar.gz) = a57dcd403489d227ed331618b1f73d38de427826
-Size (dnetc-netbsd-sparc64-elf.tar.gz) = 366479 bytes
-SHA1 (dnetc-netbsd-vax.tar.gz) = f69c542548749a647fb7bc17f6be49f78765c5ee
-RMD160 (dnetc-netbsd-vax.tar.gz) = de6942066c2a44faa6835497d69f94ab85ebfc4f
-Size (dnetc-netbsd-vax.tar.gz) = 312478 bytes
-SHA1 (dnetc-netbsd-x86-elf.tar.gz) = 22a1b861ce2b07c1e122fab16aa949b657092d78
-RMD160 (dnetc-netbsd-x86-elf.tar.gz) = 58a547e56f6a505f8853a1c27891aee7651a7f3e
-Size (dnetc-netbsd-x86-elf.tar.gz) = 356367 bytes
-SHA1 (dnetc-solaris26-sparc32.tar.gz) = dd5a764a9c4bd5e1478cef1381add81cfedc3c63
-RMD160 (dnetc-solaris26-sparc32.tar.gz) = 4ccb69f98cbfe6b917bf9762c484019b52ea6249
-Size (dnetc-solaris26-sparc32.tar.gz) = 244325 bytes
-SHA1 (dnetc-solaris7-sparc64.tar.gz) = 407074313385550d8f3f4572c15e09566ad7a8bb
-RMD160 (dnetc-solaris7-sparc64.tar.gz) = a35e07e734e092be6793fe1f04e1bb66260f5cbf
-Size (dnetc-solaris7-sparc64.tar.gz) = 264617 bytes

misc/dnetc/files/dnetc.sh

@@ -1,49 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dnetc.sh,v 1.2 2011/10/07 22:37:03 shattered Exp $
-#
-
-# PROVIDE: dnetc
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-dnetc_user="nobody"
-dnetc_group="nobody"
-dnetc_homedir="/var/db/dnetc"
-
-name="dnetc"
-rcvar=$name
-extra_commands="config"
-# XXX: We cannot use the full pathname to call dnetc's binary directly.
-# Doing so means it will not work properly.
-PATH=@PREFIX@/bin:/bin:/sbin:/usr/bin:/usr/sbin
-command="${name}"
-
-dnetc_config() {
-	if [ ! -d ${dnetc_homedir} ]; then
-		mkdir ${dnetc_homedir}
-		chmod 755 ${dnetc_homedir}
-		chown ${dnetc_user}:${dnetc_group} ${dnetc_homedir}
-	fi
-
-	su -fm ${dnetc_user} -c "cd ${dnetc_homedir} && exec ${command} -config"
-	return 0
-}
-
-dnetc_start() {
-	if [ ! -f ${dnetc_homedir}/dnetc.ini ]; then
-		run_rc_command config
-	fi
-
-	echo "Starting ${name}."
-	su -fm ${dnetc_user} -c "cd ${dnetc_homedir} && exec ${command} &" \
-	    2>/dev/null 1>/dev/null
-}
-
-config_cmd=dnetc_config
-start_cmd=dnetc_start
-
-load_rc_config $name
-run_rc_command "$1"

misc/dvtm/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/05/21 12:34:02 adam Exp $
+# $NetBSD: Makefile,v 1.10 2013/11/24 07:38:41 dholland Exp $
 
 DISTNAME=	dvtm-0.9
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.brain-dump.org/projects/dvtm/
 
@@ -11,7 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=		c99
 NO_CONFIGURE=		yes
-CURSES_DEFAULT=		ncurses
 
 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	pre-build
@@ -19,7 +19,7 @@ SUBST_MESSAGE.config=	Fixing config.mk
 SUBST_FILES.config=	config.mk
 SUBST_SED.config=	-e 's,/usr/local,${PREFIX},'
 SUBST_SED.config+=	-e 's,share/man,${PKGMANDIR},'
-SUBST_SED.config+=	-e '/LIBS/s/-lncursesw/-lncurses/'
+SUBST_SED.config+=	-e '/LIBS/s/-lncursesw/-lcurses/'
 SUBST_SED.config+=	-e 's,^CFLAGS =,CFLAGS +=,'
 SUBST_SED.config+=	-e 's,^LDFLAGS =,LDFLAGS +=,'
 SUBST_SED.config+=	-e 's/cc/${CC:Q}/'

misc/ec2-ami-tools/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 09:57:20 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/13 17:06:43 taca Exp $
 #
 
 PKGNAME=	ec2-ami-tools-1.3.57676
@@ -20,7 +20,7 @@ USE_TOOLS=	bash:run gtar:run gzip:run openssl:run pax tee:run
 
 DEPENDS+=	curl-[0-9]*:../../www/curl
 DEPENDS+=	rsync-[0-9]*:../../net/rsync
-DEPENDS+=	ruby${RUBY_VER}-base>=1.8.2:../../lang/ruby${RUBY_VER}-base
+DEPENDS+=	${RUBY_BASE}>=1.8.2:${RUBY_SRCDIR}
 
 NO_BUILD=	yes
 

misc/esniper/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2013/03/02 10:44:37 tron Exp $
+# $NetBSD: Makefile,v 1.25 2014/02/12 23:18:12 tron Exp $
 #
 
 DISTNAME=		esniper-2-23-0
 PKGNAME=		esniper-2.23.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=esniper/}
 EXTRACT_SUFX=		.tgz

misc/fbreader/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2013/06/27 14:21:09 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.39 2014/02/12 23:18:12 tron Exp $
 
 DISTNAME=	fbreader-sources-0.99.4
 PKGNAME=	${DISTNAME:S/-sources//}
+PKGREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.fbreader.org/files/desktop/
 EXTRACT_SUFX=	.tgz
@@ -40,7 +40,7 @@ CPPFLAGS+=	-DDO_ICONV_CAST
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

misc/gaupol/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 09:57:22 asau Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/01/21 21:26:41 wiz Exp $
 
 DISTNAME=	gaupol-0.19.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://download.gna.org/gaupol/0.19/
 
@@ -16,13 +15,13 @@ DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-enchant>=1.4:../../textproc/py-enchant
 DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.16:../../x11/py-gtk2
 
-PYDISTUTILSPKG= 		yes
 USE_LANGUAGES=			# none
 USE_TOOLS+=			intltool msgfmt
 
-PYSETUPARGS=		--mandir=${PREFIX}/${PKGMANDIR}
+PYSETUPARGS=			--mandir=${PREFIX}/${PKGMANDIR}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"