pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/xplanet: Apply feedback from Greg.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Tue Oct 29 11:01:52 2019 +0000
Changeset:	ed68dc7b5bd0fd4942b1590fea7d481327515e5d

Modified Files:
	xplanet/Makefile
	xplanet/distinfo
	xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp
Removed Files:
	xplanet/TODO

Log Message:
wip/xplanet: Apply feedback from Greg.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed68dc7b5bd0fd4942b1590fea7d481327515e5d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xplanet/Makefile                                       | 3 +++
 xplanet/TODO                                           | 2 --
 xplanet/distinfo                                       | 2 +-
 xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp | 5 +----
 4 files changed, 5 insertions(+), 7 deletions(-)

diffs:
diff --git a/xplanet/Makefile b/xplanet/Makefile
index 47bb863095..cb87a2f4d7 100644
--- a/xplanet/Makefile
+++ b/xplanet/Makefile
@@ -1,5 +1,8 @@
 # $NetBSD: Makefile,v 1.90 2019/08/11 15:38:22 ng0 Exp $
 
+# The 1.3.1 release is a few years old, and upstream recommends that
+# the head of svn be used.  However, we follow pkgsrc norms of
+# packaging releases, with some commits applied as patches.
 DISTNAME=	xplanet-1.3.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xplanet/}
diff --git a/xplanet/TODO b/xplanet/TODO
deleted file mode 100644
index e5139f7fdd..0000000000
--- a/xplanet/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-configure: WARNING: *** Native PNM support will not be included ***
-configure: WARNING: *** Xplanet will be built without SPICE support ***
diff --git a/xplanet/distinfo b/xplanet/distinfo
index 627370c4f0..7a052b2845 100644
--- a/xplanet/distinfo
+++ b/xplanet/distinfo
@@ -13,4 +13,4 @@ SHA1 (patch-src_libmultiple_RayleighScattering.cpp) = 3a64033dc0c6915c9cd2eed2e5
 SHA1 (patch-src_libmultiple_drawStars.cpp) = b6a3f3995f4f1ac77660fdad64524ef6a48c4d50
 SHA1 (patch-src_readConfig-fixclang.cpp) = d24cfc6f832e9445f8c968a75e4eb0a7688b0c84
 SHA1 (patch-src_readConfig.cpp) = c1a46209dfcbb6a37b6c7ff90f633a6450fbd5d9
-SHA1 (patch-src_xpUtil-Add2017LeapSecond.cpp) = 1c0842e391f92daa86fb89caa4f19be29c6ea37b
+SHA1 (patch-src_xpUtil-Add2017LeapSecond.cpp) = 6b48a78f29b441ebdcdd097d01d5479e3afc8edc
diff --git a/xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp b/xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp
index eef52078b5..068f36a095 100644
--- a/xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp
+++ b/xplanet/patches/patch-src_xpUtil-Add2017LeapSecond.cpp
@@ -1,11 +1,8 @@
 $NetBSD$
 
-pick from https://sourceforge.net/p/xplanet/code/209/
 Add 2017 leap second
+Taken from upstream: https://sourceforge.net/p/xplanet/code/209/
 
-Upstream maintainer recommended to build from svn. The latest
-release is rather old, so we pick a couple of commits required
-for functionality on top of this release.
 
 --- src/xpUtil.cpp~
 +++ src/xpUtil.cpp


Home | Main Index | Thread Index | Old Index