pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gosmore: Upstream SVN repo dead
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Sep 24 16:36:30 2016 +0200
Changeset: 5cbf24b17bdf0333e5c64a0b2fdaa7c7017ebc2b
Removed Files:
gosmore/DESCR
gosmore/Makefile
gosmore/PLIST
gosmore/distinfo
gosmore/patches/patch-aa
gosmore/patches/patch-ab
gosmore/patches/patch-ac
Log Message:
gosmore: Upstream SVN repo dead
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5cbf24b17bdf0333e5c64a0b2fdaa7c7017ebc2b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gosmore/DESCR | 2 --
gosmore/Makefile | 31 --------------------------
gosmore/PLIST | 23 -------------------
gosmore/distinfo | 5 -----
gosmore/patches/patch-aa | 26 ----------------------
gosmore/patches/patch-ab | 58 ------------------------------------------------
gosmore/patches/patch-ac | 33 ---------------------------
7 files changed, 178 deletions(-)
diffs:
diff --git a/gosmore/DESCR b/gosmore/DESCR
deleted file mode 100644
index 0240da6..0000000
--- a/gosmore/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Gosmore is a viewer of the OpenStreetmap.org XML data such as the
-planet.
diff --git a/gosmore/Makefile b/gosmore/Makefile
deleted file mode 100644
index 8a0b7af..0000000
--- a/gosmore/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2012/09/29 00:50:39 asau Exp $
-#
-
-DISTNAME= gosmore-1
-CHECKOUT_DATE= 20100722
-CATEGORIES= geography
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://wiki.openstreetmap.org/wiki/Gosmore
-COMMENT= Navigation program
-
-USE_TOOLS+= gmake pkg-config
-USE_LANGUAGES+= c c++
-GNU_CONFIGURE= yes
-
-# Get it from Subversion repository:
-SVN_REPOSITORIES= gosmore
-SVN_ROOT.gosmore= http://svn.openstreetmap.org/applications/rendering/gosmore/
-
-WRKSRC= ${WRKDIR}/gosmore
-
-.include "../../wip/mk/svn-package.mk"
-
-BUILDLINK_DEPMETHOD.bzip2= build
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/gosmore/PLIST b/gosmore/PLIST
deleted file mode 100644
index bb26187..0000000
--- a/gosmore/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2010/02/12 17:55:50 drochner Exp $
-bin/gosmore
-man/man1/gosmore.1.gz
-share/applications/gosmore.desktop
-share/gosmore/default.pak
-share/gosmore/elemstyles.xml
-share/gosmore/icons.csv
-share/gosmore/icons.xpm
-share/gosmore/keepleft.wav
-share/gosmore/keepright.wav
-share/gosmore/round1.wav
-share/gosmore/round2.wav
-share/gosmore/round3.wav
-share/gosmore/round4.wav
-share/gosmore/round5.wav
-share/gosmore/round6.wav
-share/gosmore/round7.wav
-share/gosmore/round8.wav
-share/gosmore/stop.wav
-share/gosmore/turnleft.wav
-share/gosmore/turnright.wav
-share/gosmore/uturn.wav
-share/pixmaps/gosmore.xpm
diff --git a/gosmore/distinfo b/gosmore/distinfo
deleted file mode 100644
index f3227c9..0000000
--- a/gosmore/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2010/07/22 16:56:04 drochner Exp $
-
-SHA1 (patch-aa) = d46ba5f32a27a5c01cf9c721e96b905bbdcda2f2
-SHA1 (patch-ab) = e33900208269cdac9713dec3b806394c23943291
-SHA1 (patch-ac) = 406c73c37edda97a4a71527ab5a45fa6f0e6c525
diff --git a/gosmore/patches/patch-aa b/gosmore/patches/patch-aa
deleted file mode 100644
index e0a30aa..0000000
--- a/gosmore/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/07/22 16:56:04 drochner Exp $
-
---- gosmore.cpp.orig 2010-03-23 22:02:08.000000000 +0000
-+++ gosmore.cpp
-@@ -18,6 +18,7 @@
- #include <algorithm>
- #include <queue>
- #include <map>
-+#include <cmath>
- using namespace std;
- #ifndef _WIN32
- #include <sys/mman.h>
-@@ -353,10 +354,10 @@ void ChangePak (const TCHAR *pakfile, in
- // printf ("%s %d %d\n", pakfile, (mlon >> 22) + 512, 512 - (mlat >> 22));
- if (map != (void*) -1) munmap (map, len);
-
-- FILE *gmap = fopen64 (pakfile, "r");
-+ FILE *gmap = fopen (pakfile, "r");
- if (!gmap && currentBbox == pakfile &&
-- (gmap = fopen64 ("default.pak", "r")) == NULL) {
-- gmap = fopen64 (RES_DIR "default.pak", "r");
-+ (gmap = fopen ("default.pak", "r")) == NULL) {
-+ gmap = fopen (RES_DIR "default.pak", "r");
- }
- len = gmap && fseek (gmap, 0, SEEK_END) == 0 ? ftell (gmap) : 0;
- map = !len ? (void*)-1
diff --git a/gosmore/patches/patch-ab b/gosmore/patches/patch-ab
deleted file mode 100644
index 6b57a0a..0000000
--- a/gosmore/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/07/22 16:56:04 drochner Exp $
-
---- libgosm.cpp.orig 2010-07-13 15:15:46.000000000 +0000
-+++ libgosm.cpp
-@@ -503,7 +503,7 @@ void Route (int recalculate, int plon, i
- // In particular, while gosmore is paused while a page is swapped in, the OS can
- // zero some pages for us.
- int dzero = open ("/dev/zero", O_RDWR);
-- long long ds = sysconf (_SC_PAGESIZE) * (long long) sysconf (_SC_PHYS_PAGES) /
-+ long long ds = sysconf (_SC_PAGESIZE) * 200000 /
- (sizeof (*routeHeap) + sizeof (*route) + 40);
- dhashSize = ds > INT_MAX ? INT_MAX : ds;
- routeHeapMaxSize = lrint (sqrt (dhashSize)) * 3;
-@@ -1513,7 +1513,7 @@ int RebuildPak(const char* pakfile, cons
- int ndStart;
- wayType *master = NULL;
- if (strcmp(masterpakfile,"")) {
-- if (!(masterf = fopen64 (masterpakfile, "r")) ||
-+ if (!(masterf = fopen (masterpakfile, "r")) ||
- fseek (masterf, -sizeof (ndStart), SEEK_END) != 0 ||
- fread (&ndStart, sizeof (ndStart), 1, masterf) != 1 ||
- (long)(master = (wayType *)mmap (NULL, ndStart, PROT_READ,
-@@ -1524,7 +1524,7 @@ int RebuildPak(const char* pakfile, cons
- }
- }
-
-- if (!(pak = fopen64 (pakfile, "w+"))) {
-+ if (!(pak = fopen (pakfile, "w+"))) {
- fprintf (stderr, "Cannot create %s\n",pakfile);
- return 2;
- }
-@@ -1547,7 +1547,7 @@ int RebuildPak(const char* pakfile, cons
- for (int i = 0; i < PAIRGROUP2 (0) + PAIRGROUPS2; i++) {
- sprintf (groupName[i], "%c%c%d.tmp", i / 26 % 26 + 'a', i % 26 + 'a',
- i / 26 / 26);
-- if (i < S2GROUP (0) && !(groupf[i] = fopen64 (groupName[i], "w+"))) {
-+ if (i < S2GROUP (0) && !(groupf[i] = fopen (groupName[i], "w+"))) {
- fprintf (stderr, "Cannot create temporary file.\n"
- "Possibly too many open files, in which case you must run "
- "ulimit -n or recompile\n");
-@@ -1956,7 +1956,7 @@ int RebuildPak(const char* pakfile, cons
-
- for (int i = 0; i < IDXGROUPS; i++) fclose (groupf[i]);
- for (int i = S2GROUP (0); i < PAIRGROUP2 (0) + PAIRGROUPS2; i++) {
-- assert (groupf[i] = fopen64 (groupName[i], "w+"));
-+ assert (groupf[i] = fopen (groupName[i], "w+"));
- } // Avoid exceeding ulimit
-
- nodeType *nodes = (nodeType *) malloc (sizeof (*nodes) * MAX_NODES);
-@@ -2211,7 +2211,7 @@ int RebuildPak(const char* pakfile, cons
- }
-
- REBUILDWATCH (for (int i = 0; i < IDXGROUPS; i++)) {
-- assert (groupf[i] = fopen64 (groupName[i], "r+"));
-+ assert (groupf[i] = fopen (groupName[i], "r+"));
- fseek (groupf[i], 0, SEEK_END);
- int fsize = ftell (groupf[i]);
- if (fsize > 0) {
diff --git a/gosmore/patches/patch-ac b/gosmore/patches/patch-ac
deleted file mode 100644
index 61522e1..0000000
--- a/gosmore/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/07/22 16:56:04 drochner Exp $
-
---- Makefile.in.orig 2010-07-22 15:59:49.000000000 +0000
-+++ Makefile.in
-@@ -140,14 +140,14 @@ install: gosmore default.pak
- mkdir -p $(DESTDIR)$(bindir)
- cp gosmore $(DESTDIR)$(bindir)/.
- mkdir -p $(DESTDIR)$(datarootdir)/gosmore
-- cp -a *.wav default.pak elemstyles.xml icons.csv icons.xpm \
-+ cp *.wav default.pak elemstyles.xml icons.csv icons.xpm \
- $(DESTDIR)$(datarootdir)/gosmore
-- mkdir -p $(DESTDIR)$(datarootdir)/man/man1
-- gzip <gosmore.1 >$(DESTDIR)$(datarootdir)/man/man1/gosmore.1.gz
-+ mkdir -p $(DESTDIR)$(prefix)/$(PKGMANDIR)/man1
-+ gzip <gosmore.1 >$(DESTDIR)$(prefix)/$(PKGMANDIR)/man1/gosmore.1.gz
- mkdir -p $(DESTDIR)$(datarootdir)/pixmaps
-- cp -a gosmore.xpm $(DESTDIR)$(datarootdir)/pixmaps
-+ cp gosmore.xpm $(DESTDIR)$(datarootdir)/pixmaps
- mkdir -p $(DESTDIR)$(datarootdir)/applications
-- cp -a gosmore.desktop $(DESTDIR)$(datarootdir)/applications
-+ cp gosmore.desktop $(DESTDIR)$(datarootdir)/applications
-
- # The commands below will create a gpx file with a low res version of the national boundaries
- # Then you must open tmp.gpx in JOSM and save it as bounds.osm. Then this makefile will
-@@ -164,7 +164,7 @@ install: gosmore default.pak
-
- default.pak: gosmore
- ! [ -e gosmore.pak ]
-- (bzgrep -v '</osm>' bounds.osm.bz2 | sed -e 's/'\''-\([0-9]*'\''\)/'\''00000000\1/' |\
-+ (bzcat bounds.osm.bz2 | grep -v '</osm>' | sed -e 's/'\''-\([0-9]*'\''\)/'\''00000000\1/' |\
- sed -e 's/0*\([0-9]\{8\}'\''\)/21\1/'; \
- bzcat lowres.osm.bz2; \
- egrep -v '?xml|<osmCha' countries.osm | sed -e 's|/osmChange|/osm|') | \
Home |
Main Index |
Thread Index |
Old Index