[30556] trunk/dports/devel/glib2

[source_changes at macosforge.org]

Revision: 30556
          http://trac.macosforge.org/projects/macports/changeset/30556
Author:   ryandesign at macports.org
Date:     2007-10-30 23:33:40 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
glib2: fix names of patchfiles

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2/files/patch-gi18n.h.diff
    trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff
    trunk/dports/devel/glib2/files/patch-gutils.c.diff

Removed Paths:
-------------
    trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in
    trunk/dports/devel/glib2/files/patch-glib__gutils.c
    trunk/dports/devel/glib2/files/patch-glib_gi18n.h

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2007-10-31 05:55:56 UTC (rev 30555)
+++ trunk/dports/devel/glib2/Portfile	2007-10-31 06:33:40 UTC (rev 30556)
@@ -31,9 +31,9 @@
 	rmd160 23a1f83abdd7de9863bd02e4a75396ea75918810
 
 patchfiles \
-	patch-glib-2.0.pc.in \
-	patch-glib__gutils.c \
-	patch-glib_gi18n.h
+	patch-glib-2.0.pc.in.diff \
+	patch-gutils.c.diff \
+	patch-gi18n.h.diff
 
 depends_build \
 	port:pkgconfig

Copied: trunk/dports/devel/glib2/files/patch-gi18n.h.diff (from rev 30555, trunk/dports/devel/glib2/files/patch-glib_gi18n.h)
===================================================================
--- trunk/dports/devel/glib2/files/patch-gi18n.h.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-gi18n.h.diff	2007-10-31 06:33:40 UTC (rev 30556)
@@ -0,0 +1,17 @@
+--- glib/gi18n.h~	2007-07-21 05:05:22.000000000 -0400
++++ glib/gi18n.h	2007-07-21 05:07:01.000000000 -0400
+@@ -25,10 +25,14 @@
+ #define _(String) gettext (String)
+ #define Q_(String) g_strip_context ((String), gettext (String))
+ #ifdef gettext_noop
++#ifndef N_
+ #define N_(String) gettext_noop (String)
++#endif
+ #else
++#ifndef N_
+ #define N_(String) (String)
+ #endif
++#endif
+ 
+ #endif  /* __G_I18N_H__ */
+ 

Deleted: trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in	2007-10-31 05:55:56 UTC (rev 30555)
+++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in	2007-10-31 06:33:40 UTC (rev 30556)
@@ -1,9 +0,0 @@
---- glib-2.0.pc.in.orig	2006-07-18 10:58:13.000000000 -0700
-+++ glib-2.0.pc.in	2006-07-18 11:01:55.000000000 -0700
-@@ -11,5 +11,5 @@
- Description: C Utility Library
- Version: @VERSION@
- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
-+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir}
- 

Copied: trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff (from rev 30555, trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in)
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff	2007-10-31 06:33:40 UTC (rev 30556)
@@ -0,0 +1,9 @@
+--- glib-2.0.pc.in.orig	2006-07-18 10:58:13.000000000 -0700
++++ glib-2.0.pc.in	2006-07-18 11:01:55.000000000 -0700
+@@ -11,5 +11,5 @@
+ Description: C Utility Library
+ Version: @VERSION@
+ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
+-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
++Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir}
+ 

Deleted: trunk/dports/devel/glib2/files/patch-glib__gutils.c
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib__gutils.c	2007-10-31 05:55:56 UTC (rev 30555)
+++ trunk/dports/devel/glib2/files/patch-glib__gutils.c	2007-10-31 06:33:40 UTC (rev 30556)
@@ -1,10 +0,0 @@
---- glib/gutils.c.orig	2005-09-28 00:06:16.000000000 -0700
-+++ glib/gutils.c	2005-09-28 00:06:48.000000000 -0700
-@@ -48,6 +48,7 @@
- #endif
- #ifdef HAVE_CRT_EXTERNS_H 
- #include <crt_externs.h> /* for _NSGetEnviron */
-+#define HAVE__NSGETENVIRON
- #endif
- 
- /* implement gutils's inline functions

Deleted: trunk/dports/devel/glib2/files/patch-glib_gi18n.h
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib_gi18n.h	2007-10-31 05:55:56 UTC (rev 30555)
+++ trunk/dports/devel/glib2/files/patch-glib_gi18n.h	2007-10-31 06:33:40 UTC (rev 30556)
@@ -1,17 +0,0 @@
---- glib/gi18n.h~	2007-07-21 05:05:22.000000000 -0400
-+++ glib/gi18n.h	2007-07-21 05:07:01.000000000 -0400
-@@ -25,10 +25,14 @@
- #define _(String) gettext (String)
- #define Q_(String) g_strip_context ((String), gettext (String))
- #ifdef gettext_noop
-+#ifndef N_
- #define N_(String) gettext_noop (String)
-+#endif
- #else
-+#ifndef N_
- #define N_(String) (String)
- #endif
-+#endif
- 
- #endif  /* __G_I18N_H__ */
- 

Copied: trunk/dports/devel/glib2/files/patch-gutils.c.diff (from rev 30555, trunk/dports/devel/glib2/files/patch-glib__gutils.c)
===================================================================
--- trunk/dports/devel/glib2/files/patch-gutils.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-gutils.c.diff	2007-10-31 06:33:40 UTC (rev 30556)
@@ -0,0 +1,10 @@
+--- glib/gutils.c.orig	2005-09-28 00:06:16.000000000 -0700
++++ glib/gutils.c	2005-09-28 00:06:48.000000000 -0700
+@@ -48,6 +48,7 @@
+ #endif
+ #ifdef HAVE_CRT_EXTERNS_H 
+ #include <crt_externs.h> /* for _NSGetEnviron */
++#define HAVE__NSGETENVIRON
+ #endif
+ 
+ /* implement gutils's inline functions

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071030/ecb943de/attachment.html