Now that our realpath() implementation supports auto-allocation if
the second argument is NULL, we can remove the workarounds. There
are only three ports that patch around this:
games/manaplus
productivity/workrave
x11/gnome/seed
I'll leave seed alone, because the patches are upstream code (and
one is entangled with other fixes).
OK for manaplus and workrave?
Index: games/manaplus/Makefile
===================================================================
RCS file: /cvs/ports/games/manaplus/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- games/manaplus/Makefile 10 Jul 2011 09:56:51 -0000 1.1.1.1
+++ games/manaplus/Makefile 26 Jul 2011 14:22:17 -0000
@@ -4,6 +4,7 @@ COMMENT = extended client for The Mana W
V = 1.1.6.26
DISTNAME = manaplus-${V}
+REVISION = 0
CATEGORIES = games x11
Index: games/manaplus/patches/patch-src_utils_paths_cpp
===================================================================
RCS file: games/manaplus/patches/patch-src_utils_paths_cpp
diff -N games/manaplus/patches/patch-src_utils_paths_cpp
--- games/manaplus/patches/patch-src_utils_paths_cpp 10 Jul 2011 09:56:51
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_utils_paths_cpp,v 1.1.1.1 2011/07/10 09:56:51 jasper Exp $
---- src/utils/paths.cpp.orig Sat Jun 25 18:12:10 2011
-+++ src/utils/paths.cpp Wed Jun 29 21:05:35 2011
-@@ -25,6 +25,7 @@
- #include <cstdio>
-
- #include <stdlib.h>
-+#include <limits.h>
-
- #ifdef WIN32
- #define realpath(N, R) _fullpath((R), (N), _MAX_PATH)
-@@ -35,7 +36,8 @@
- std::string getRealPath(const std::string &str)
- {
- std::string path;
-- char *realPath = realpath(str.c_str(), NULL);
-+ char *realPath = (char*)calloc(PATH_MAX, sizeof(char));
-+ realpath(str.c_str(), realPath);
- path = realPath;
- free(realPath);
- return path;
Index: productivity/workrave/Makefile
===================================================================
RCS file: /cvs/ports/productivity/workrave/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- productivity/workrave/Makefile 8 Jun 2011 17:37:46 -0000 1.25
+++ productivity/workrave/Makefile 26 Jul 2011 14:22:17 -0000
@@ -5,7 +5,7 @@ COMMENT= reminder program for preventio
DISTNAME= workrave-1.9.3
CATEGORIES= productivity x11
-REVISION= 1
+REVISION= 2
HOMEPAGE= http://www.workrave.org/
Index: productivity/workrave/patches/patch-frontend_common_src_SoundPlayer_cc
===================================================================
RCS file: productivity/workrave/patches/patch-frontend_common_src_SoundPlayer_cc
diff -N productivity/workrave/patches/patch-frontend_common_src_SoundPlayer_cc
--- productivity/workrave/patches/patch-frontend_common_src_SoundPlayer_cc
16 Jan 2011 20:34:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-frontend_common_src_SoundPlayer_cc,v 1.1 2011/01/16 20:34:40
ajacoutot Exp $
-
-Our realpath(3) does not support resolved to be specified as NULL.
-
---- frontend/common/src/SoundPlayer.cc.orig Sat Jan 15 10:28:46 2011
-+++ frontend/common/src/SoundPlayer.cc Sat Jan 15 10:29:27 2011
-@@ -522,7 +522,7 @@ SoundPlayer::load_sound_theme(const string &themefilen
- gchar *pathname = g_build_filename(themedir, filename, NULL);
- if (pathname != NULL)
- {
--#ifdef HAVE_REALPATH
-+#if defined HAVE_REALPATH && !defined __OpenBSD__
- sound_pathname = realpath(pathname, NULL);
- if (sound_pathname == NULL)
- {
--
Christian "naddy" Weisgerber na...@mips.inka.de
