pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/pkg-config drop cygwin-izm.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/16ec466dd885
branches:  trunk
changeset: 639908:16ec466dd885
user:      obache <obache%pkgsrc.org@localhost>
date:      Wed Oct 01 08:50:33 2014 +0000

description:
drop cygwin-izm.

diffstat:

 devel/pkg-config/distinfo                                          |  14 +-
 devel/pkg-config/patches/patch-glib_configure                      |  16 -
 devel/pkg-config/patches/patch-glib_configure.ac                   |  16 -
 devel/pkg-config/patches/patch-glib_glib_gatomic.c                 |  15 -
 devel/pkg-config/patches/patch-glib_glib_gcharset.c                |  15 -
 devel/pkg-config/patches/patch-glib_glib_gconvert.c                |  43 ----
 devel/pkg-config/patches/patch-glib_glib_gfileutils.c              |  31 ---
 devel/pkg-config/patches/patch-glib_glib_glib.h                    |  15 -
 devel/pkg-config/patches/patch-glib_glib_gutf8.c                   |  15 -
 devel/pkg-config/patches/patch-glib_glib_gutils.c                  |  42 ----
 devel/pkg-config/patches/patch-glib_glib_gutils.h                  |  23 --
 devel/pkg-config/patches/patch-glib_glib_gwin32.h                  |  40 ----
 devel/pkg-config/patches/patch-glib_glib_libcharset_localcharset.c |  89 ----------
 13 files changed, 1 insertions(+), 373 deletions(-)

diffs (truncated from 432 to 300 lines):

diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/distinfo
--- a/devel/pkg-config/distinfo Wed Oct 01 08:34:23 2014 +0000
+++ b/devel/pkg-config/distinfo Wed Oct 01 08:50:33 2014 +0000
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.26 2014/07/18 19:50:47 ryoon Exp $
+$NetBSD: distinfo,v 1.27 2014/10/01 08:50:33 obache Exp $
 
 SHA1 (pkg-config-0.28.tar.gz) = 71853779b12f958777bffcb8ca6d849b4d3bed46
 RMD160 (pkg-config-0.28.tar.gz) = 233f0b667cfb8f2e6a5647984d6389a770132173
 Size (pkg-config-0.28.tar.gz) = 1931203 bytes
 SHA1 (patch-configure) = 286dcc405ae8f4d4c6e8598960ed03ba5822dfb1
-SHA1 (patch-glib_configure) = 4c1ea76c1c194fb085c8ae63d391c304e852d100
-SHA1 (patch-glib_configure.ac) = 75b0d3bfd806ca608b19a477cfe1cbc17654f579
-SHA1 (patch-glib_glib_gatomic.c) = d1ba014c58e04ba7be2fa1c7f852ed8fd71fe1c0
-SHA1 (patch-glib_glib_gcharset.c) = b191bc3ca806cff6fa54790fc225ddb35a158d55
-SHA1 (patch-glib_glib_gconvert.c) = 11a6c7cdd3a4473ff522bf7a0e7ad33653199970
-SHA1 (patch-glib_glib_gfileutils.c) = bc52e4435ad16a7e7f6780330d4b2b174a3a4411
-SHA1 (patch-glib_glib_glib.h) = 1c1baedb0f3266d948ded595b70b132821702963
 SHA1 (patch-glib_glib_gtimer.c) = abd8b5fa7d3a748385b91d47728531da37e1b4e5
-SHA1 (patch-glib_glib_gutf8.c) = 2ed8ea7b843e3d07392671201c8dfe1111e29065
-SHA1 (patch-glib_glib_gutils.c) = 60e16596d898324261fd6ae3ab1643beb8cb3ed3
-SHA1 (patch-glib_glib_gutils.h) = 9fdca0280fa7871c231b75fd6281c72dd621fac4
-SHA1 (patch-glib_glib_gwin32.h) = 8f3dba0a47a10280cdc1a96df8476796cf65d0e1
-SHA1 (patch-glib_glib_libcharset_localcharset.c) = dd4fc8979a31d74eb837cce5778711c1c76bc74e
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_configure
--- a/devel/pkg-config/patches/patch-glib_configure     Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-glib_configure,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/configure.orig        2013-01-22 13:13:56.000000000 +0000
-+++ glib/configure
-@@ -25733,9 +25733,6 @@ $as_echo "$broken_poll" >&6; }
- 
- 
- case $host in
--  *-*-cygwin*)
--      G_LIBS_EXTRA="-luser32 -lkernel32"
--    ;;
-   *-*-mingw*)
-       G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi"
-     ;;
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_configure.ac
--- a/devel/pkg-config/patches/patch-glib_configure.ac  Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-glib_configure.ac,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/configure.ac.orig     2012-10-13 14:35:36.000000000 +0000
-+++ glib/configure.ac
-@@ -2397,9 +2397,6 @@ dnl *** Win32 API libs ***
- dnl **********************
- 
- case $host in
--  *-*-cygwin*)
--      G_LIBS_EXTRA="-luser32 -lkernel32"
--    ;;
-   *-*-mingw*)
-       G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi"
-     ;;
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gatomic.c
--- a/devel/pkg-config/patches/patch-glib_glib_gatomic.c        Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glib_gatomic.c,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gatomic.c.orig   2012-10-02 05:49:07.000000000 +0000
-+++ glib/glib/gatomic.c
-@@ -464,7 +464,7 @@ gsize
-   return g_atomic_pointer_xor ((volatile gpointer *) atomic, val);
- }
- 
--#elif defined (G_PLATFORM_WIN32)
-+#elif defined (G_OS_WIN32)
- 
- #include <windows.h>
- #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64)
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gcharset.c
--- a/devel/pkg-config/patches/patch-glib_glib_gcharset.c       Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glib_gcharset.c,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gcharset.c.orig  2012-10-02 05:49:07.000000000 +0000
-+++ glib/glib/gcharset.c
-@@ -496,7 +496,7 @@ guess_category_value (const gchar *categ
-   if ((retval != NULL) && (retval[0] != '\0'))
-     return retval;
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
-   /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and
-    * LANG, which we already did above. Oh well. The main point of
-    * calling g_win32_getlocale() is to get the thread's locale as used
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gconvert.c
--- a/devel/pkg-config/patches/patch-glib_glib_gconvert.c       Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-glib_glib_gconvert.c,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gconvert.c.orig  2012-10-02 05:49:07.000000000 +0000
-+++ glib/glib/gconvert.c
-@@ -33,9 +33,6 @@
- 
- #ifdef G_OS_WIN32
- #include "win_iconv.c"
--#endif
--
--#ifdef G_PLATFORM_WIN32
- #define STRICT
- #include <windows.h>
- #undef STRICT
-@@ -1262,7 +1259,7 @@ g_locale_from_utf8 (const gchar *utf8str
-                     charset, "UTF-8", bytes_read, bytes_written, error);
- }
- 
--#ifndef G_PLATFORM_WIN32
-+#ifndef G_OS_WIN32
- 
- typedef struct _GFilenameCharsetCache GFilenameCharsetCache;
- 
-@@ -1378,7 +1375,7 @@ g_get_filename_charsets (const gchar ***
-   return cache->is_utf8;
- }
- 
--#else /* G_PLATFORM_WIN32 */
-+#else /* G_OS_WIN32 */
- 
- gboolean
- g_get_filename_charsets (const gchar ***filename_charsets) 
-@@ -1407,7 +1404,7 @@ g_get_filename_charsets (const gchar ***
- #endif
- }
- 
--#endif /* G_PLATFORM_WIN32 */
-+#endif /* G_OS_WIN32 */
- 
- static gboolean
- get_filename_charset (const gchar **filename_charset)
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gfileutils.c
--- a/devel/pkg-config/patches/patch-glib_glib_gfileutils.c     Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-glib_glib_gfileutils.c,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gfileutils.c.orig        2012-10-13 14:35:36.000000000 +0000
-+++ glib/glib/gfileutils.c
-@@ -2175,7 +2175,7 @@ g_path_skip_root (const gchar *file_name
- {
-   g_return_val_if_fail (file_name != NULL, NULL);
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
-   /* Skip \\server\share or //server/share */
-   if (G_IS_DIR_SEPARATOR (file_name[0]) &&
-       G_IS_DIR_SEPARATOR (file_name[1]) &&
-@@ -2185,7 +2185,6 @@ g_path_skip_root (const gchar *file_name
-       gchar *p;
-       p = strchr (file_name + 2, G_DIR_SEPARATOR);
- 
--#ifdef G_OS_WIN32
-       {
-         gchar *q;
- 
-@@ -2193,7 +2192,6 @@ g_path_skip_root (const gchar *file_name
-         if (p == NULL || (q != NULL && q < p))
-         p = q;
-       }
--#endif
- 
-       if (p && p > file_name + 2 && p[1])
-         {
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_glib.h
--- a/devel/pkg-config/patches/patch-glib_glib_glib.h   Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glib_glib.h,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/glib.h.orig      2012-10-02 05:49:07.000000000 +0000
-+++ glib/glib/glib.h
-@@ -95,7 +95,7 @@
- #include <glib/gvariant.h>
- #include <glib/gversion.h>
- #include <glib/gversionmacros.h>
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
- #include <glib/gwin32.h>
- #endif
- 
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gutf8.c
--- a/devel/pkg-config/patches/patch-glib_glib_gutf8.c  Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glib_glib_gutf8.c,v 1.1 2013/04/13 11:10:04 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gutf8.c.orig     2012-10-13 14:35:36.000000000 +0000
-+++ glib/glib/gutf8.c
-@@ -27,7 +27,7 @@
- #endif
- #include <string.h>
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
- #include <stdio.h>
- #define STRICT
- #include <windows.h>
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gutils.c
--- a/devel/pkg-config/patches/patch-glib_glib_gutils.c Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-glib_glib_gutils.c,v 1.1 2013/04/13 11:10:05 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gutils.c.orig    2012-10-13 14:35:36.000000000 +0000
-+++ glib/glib/gutils.c
-@@ -71,7 +71,7 @@
- #include "garray.h"
- #include "glibintl.h"
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
- #include "gconvert.h"
- #include "gwin32.h"
- #endif
-@@ -85,16 +85,13 @@
-  * These are portable utility functions.
-  */
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
- #  include <windows.h>
- #  ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
- #    define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2
- #    define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4
- #  endif
- #  include <lmcons.h>         /* For UNLEN */
--#endif /* G_PLATFORM_WIN32 */
--
--#ifdef G_OS_WIN32
- #  include <direct.h>
- #  include <shlobj.h>
-    /* older SDK (e.g. msvc 5.0) does not have these*/
-@@ -130,7 +127,7 @@
- #include <langinfo.h>
- #endif
- 
--#ifdef G_PLATFORM_WIN32
-+#ifdef G_OS_WIN32
- 
- gchar *
- _glib_get_dll_directory (void)
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gutils.h
--- a/devel/pkg-config/patches/patch-glib_glib_gutils.h Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-glib_glib_gutils.h,v 1.1 2013/04/13 11:10:05 obache Exp $
-
-* from glib2.0.cygport 2.32.1-not-win32.patch
-
---- glib/glib/gutils.h.orig    2012-10-13 14:35:36.000000000 +0000
-+++ glib/glib/gutils.h
-@@ -342,7 +342,7 @@ G_END_DECLS
-  * On non-Windows platforms, expands to nothing.
-  */
- 
--#ifndef G_PLATFORM_WIN32
-+#ifndef G_OS_WIN32
- # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
- #else
- # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)                       \
-@@ -370,6 +370,6 @@ DllMain (HINSTANCE hinstDLL,                                               \
- 
- #endif        /* !G_DISABLE_DEPRECATED */
- 
--#endif /* G_PLATFORM_WIN32 */
-+#endif /* G_OS_WIN32 */
- 
- #endif /* __G_UTILS_H__ */
diff -r e2253523fdde -r 16ec466dd885 devel/pkg-config/patches/patch-glib_glib_gwin32.h
--- a/devel/pkg-config/patches/patch-glib_glib_gwin32.h Wed Oct 01 08:34:23 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-glib_glib_gwin32.h,v 1.1 2013/04/13 11:10:05 obache Exp $



Home | Main Index | Thread Index | Old Index