summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/glib/Makefile66
-rw-r--r--devel/glib/buildlink3.mk4
-rw-r--r--devel/glib/distinfo4
-rw-r--r--devel/glib/patches/patch-af6
4 files changed, 33 insertions, 47 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 91edffa7352..be989c1f248 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2006/05/13 11:31:11 rillig Exp $
+# $NetBSD: Makefile,v 1.81 2006/06/08 21:13:38 tron Exp $
DISTNAME= glib-1.2.10
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE= glib.pc.in
PKGCONFIG_OVERRIDE+= gmodule.pc.in
PKGCONFIG_OVERRIDE+= gthread.pc.in
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
-INFO_FILES= # PLIST
+INFO_FILES= yes
TEST_TARGET= check
@@ -45,43 +45,31 @@ GLIB_MAJOR_VERSION= ${GLIB_VERSION:C/\..*//}
GLIB_MINOR_VERSION= ${GLIB_VERSION:C/[^.]*\.//:C/\..*//}
GLIB_MICRO_VERSION= ${GLIB_VERSION:C/.*\.//}
-# We patch the version info in the configure scripts for reasons related to
-# shared library numbering, but we don't want it to leak into the various
-# installed files. Explicitly replace the version number with the correct
-# one derived from the package name.
-#
-pre-configure:
- set -e; \
- cd ${WRKSRC}; \
- files="glib-config.in docs/glib-config.1.in glib.pc.in gmodule.pc.in gthread.pc.in"; \
- for f in $${files}; do \
- ${SED} -e "s|@GLIB_VERSION@|${GLIB_VERSION}|g" \
- -e "s|@VERSION@|${GLIB_VERSION}|g" \
- $${f} > $${f}.fixed; \
- ${MV} -f $${f}.fixed $${f}; \
- done
-
-post-configure:
- set -e; \
- cd ${WRKSRC}; \
- files="config.status config.h glibconfig.h"; \
- for f in $${files}; do \
- ${SED} -e "s|^\\(#define.*GLIB_MAJOR_VERSION\\).*|\\1 ${GLIB_MAJOR_VERSION}|" \
- -e "s|^\\(#define.*GLIB_MINOR_VERSION\\).*|\\1 ${GLIB_MINOR_VERSION}|" \
- -e "s|^\\(#define.*GLIB_MICRO_VERSION\\).*|\\1 ${GLIB_MICRO_VERSION}|" \
- $${f} > $${f}.fixed; \
- ${MV} $${f}.fixed $${f}; \
- done; \
- ${CHMOD} +x config.status
+SUBST_CLASSES+= shlib1
+SUBST_MESSAGE.shlib1= Fixing shared library versions (part 1)
+SUBST_STAGE.shlib1= pre-configure
+SUBST_FILES.shlib1= glib-config.in docs/glib-config.1.in glib.pc.in \
+ gmodule.pc.in gthread.pc.in
+SUBST_SED.shlib1= -e "s|@GLIB_VERSION@|${GLIB_VERSION}|g"
+SUBST_SED.shlib1+= -e "s|@VERSION@|${GLIB_VERSION}|g"
+
+SUBST_CLASSES+= shlib2
+SUBST_MESSAGE.shlib2= Fixing shared library versions (part 2)
+SUBST_STAGE.shlib2= post-configure
+SUBST_FILES.shlib2= config.status config.h glibconfig.h
+SUBST_SED.shlib2= -e "s|^\\(\#define.*GLIB_MAJOR_VERSION\\).*|\\1 ${GLIB_MAJOR_VERSION}|"
+SUBST_SED.shlib2+= -e "s|^\\(\#define.*GLIB_MINOR_VERSION\\).*|\\1 ${GLIB_MINOR_VERSION}|"
+SUBST_SED.shlib2+= -e "s|^\\(\#define.*GLIB_MICRO_VERSION\\).*|\\1 ${GLIB_MICRO_VERSION}|"
+
+#post-configure:
+# ${CHMOD} +x config.status
+
.if exists(/usr/include/sys/null.h)
- set -e; \
- cd ${WRKSRC}; \
- files="glib.h"; \
- for f in $${files}; do \
- ${SED} -e "s|^#define.NULL.*|#include <sys/null.h>|" \
- $${f} > $${f}.fixed; \
- ${MV} $${f}.fixed $${f}; \
- done
+SUBST_CLASSES+= null
+SUBST_MESSAGE.null= Using "sys/null.h" to get definition of NULL.
+SUBST_STAGE.null= post-configure
+SUBST_FILES.null= glib.h
+SUBST_SED.null= -e "s|^\#define.NULL.*|\#include <sys/null.h>|"
.endif
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index b03d0afe291..d8fc3ddff17 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:49 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/06/08 21:13:38 tron Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
@@ -14,9 +14,9 @@ BUILDLINK_PACKAGES+= glib
BUILDLINK_API_DEPENDS.glib+= glib>=1.2.10nb5
BUILDLINK_ABI_DEPENDS.glib+= glib>=1.2.10nb7
BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
-.endif # GLIB_BUILDLINK3_MK
PTHREAD_OPTS+= require
+.endif # GLIB_BUILDLINK3_MK
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index 35e4571b909..d30992ee6b1 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/01/12 19:49:15 joerg Exp $
+$NetBSD: distinfo,v 1.18 2006/06/08 21:13:39 tron Exp $
SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
RMD160 (glib-1.2.10.tar.gz) = f19efe8c87ebeea979a4d36902d8a8209640cd95
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7
SHA1 (patch-ac) = 4ce393ab5cd08f8971faf7967f21669df0caae52
SHA1 (patch-ad) = 5fa5ea7cc11fdd8e2f14b6a05e7c77e8359e8ec4
SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59
-SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e
+SHA1 (patch-af) = e37c4c7257a439a3ed78cdcb5715ef993ebccd84
SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604
SHA1 (patch-ah) = 1e6dec25db0c72601868bb0f7c465202ecead81b
SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d
diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af
index 5dad7127fe6..62b22d5d340 100644
--- a/devel/glib/patches/patch-af
+++ b/devel/glib/patches/patch-af
@@ -1,14 +1,12 @@
-$NetBSD: patch-af,v 1.5 2004/02/08 23:22:45 mjl Exp $
+$NetBSD: patch-af,v 1.6 2006/06/08 21:13:39 tron Exp $
--- gutils.c.orig 2003-09-04 22:39:55.000000000 +0200
+++ gutils.c 2003-09-04 22:41:06.000000000 +0200
-@@ -483,6 +483,9 @@
+@@ -483,6 +483,7 @@
# ifdef _SC_GETPW_R_SIZE_MAX
/* This reurns the maximum length */
guint bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
+ if (bufsize == (guint) -1) bufsize = 64; /* XXX Correct for unimpelemented SC */
-+#endif /* __FreeBSD__ */
# else /* _SC_GETPW_R_SIZE_MAX */
guint bufsize = 64;
# endif /* _SC_GETPW_R_SIZE_MAX */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 20:31:57 +0000