cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.0.6, make it aware of our MAX/MIN macros and make library

Browse Source 
versions controllable from the makefile.
This commit is contained in:
nino 2002-08-07 13:11:53 +00:00
parent ad6252af53
commit 74b8917131
8 changed files with 93 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/glib2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2002/07/28 12:00:51 nino Exp $
# $OpenBSD: Makefile,v 1.3 2002/08/07 13:11:53 nino Exp $
COMMENT= "general-purpose utility library"
COMMENT-docs= "glib2 documentation"
VERSION= 2.0.4
VERSION= 2.0.6
DISTNAME= glib-${VERSION}
PKGNAME= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@ -30,6 +30,12 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
RUN_DEPENDS= ${BUILD_DEPENDS}
.endif
# library versions (major:minor)
LIBGLIB_VERSION= 0:4
LIBGOBJECT_VERSION= 0:4
LIBGTHREAD_VERSION= 0:4
LIBGMODULE_VERSION= 0:4
USE_GMAKE= Yes
SEPARATE_BUILD= simple
CONFIGURE_STYLE= gnu
@ -37,6 +43,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= LIBGLIB_VERSION="${LIBGLIB_VERSION}" \
LIBGOBJECT_VERSION="${LIBGOBJECT_VERSION}" \
LIBGTHREAD_VERSION="${LIBGTHREAD_VERSION}" \
LIBGMODULE_VERSION="${LIBGMODULE_VERSION}"
NO_REGRESS= Yes

6
devel/glib2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (glib-2.0.4.tar.bz2) = a4101c1f3fc1306eeb8f048f08e3f4b1
RMD160 (glib-2.0.4.tar.bz2) = 102b87d93ba128374986856505ca82bae22e1249
SHA1 (glib-2.0.4.tar.bz2) = 6ef90e05109da8ee68f70a1d9e69d160dc8dac14
MD5 (glib-2.0.6.tar.bz2) = 79e9dc83219e6ad4f95f3ffce5635203
RMD160 (glib-2.0.6.tar.bz2) = b2160efbb2fb75139aab80110bbb4968a2f309d2
SHA1 (glib-2.0.6.tar.bz2) = e00592c2f6a2a1c2cfe763d194215e86d2bdff5d

12
devel/glib2/patches/patch-glib_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-glib_Makefile_in,v 1.1 2002/08/07 13:11:53 nino Exp $
--- glib/Makefile.in.orig Wed Aug 7 13:29:33 2002
+++ glib/Makefile.in Wed Aug 7 13:30:17 2002
@@ -294,7 +294,7 @@ libglib_2_0_la_LIBADD = libcharset/libch
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
libglib_2_0_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGLIB_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

27
devel/glib2/patches/patch-glib_gmacros_h Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-glib_gmacros_h,v 1.1 2002/08/07 13:11:53 nino Exp $
--- glib/gmacros.h.orig Wed Aug 7 10:57:41 2002
+++ glib/gmacros.h Wed Aug 7 10:58:56 2002
@@ -34,6 +34,7 @@
/* We include stddef.h to get the system's definition of NULL
*/
#include <stddef.h>
+#include <sys/param.h>
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
@@ -130,11 +131,13 @@
#define TRUE (!FALSE)
#endif
-#undef MAX
+#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
-#undef MIN
+#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
#undef ABS
#define ABS(a) (((a) < 0) ? -(a) : (a))

12
devel/glib2/patches/patch-gmodule_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gmodule_Makefile_in,v 1.1 2002/08/07 13:11:53 nino Exp $
--- gmodule/Makefile.in.orig Wed Aug 7 13:35:21 2002
+++ gmodule/Makefile.in Wed Aug 7 13:35:51 2002
@@ -194,7 +194,7 @@ lib_LTLIBRARIES = libgmodule-2.0.la
libgmodule_2_0_la_SOURCES = gmodule.c
libgmodule_2_0_la_LDFLAGS = \
@G_MODULE_LDFLAGS@ \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGMODULE_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

12
devel/glib2/patches/patch-gobject_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gobject_Makefile_in,v 1.1 2002/08/07 13:11:53 nino Exp $
--- gobject/Makefile.in.orig Wed Aug 7 13:37:04 2002
+++ gobject/Makefile.in Wed Aug 7 13:37:26 2002
@@ -176,7 +176,7 @@ lib_LTLIBRARIES = libgobject-2.0.la
# libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGOBJECT_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@

12
devel/glib2/patches/patch-gthread_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gthread_Makefile_in,v 1.1 2002/08/07 13:11:53 nino Exp $
--- gthread/Makefile.in.orig Wed Aug 7 13:35:56 2002
+++ gthread/Makefile.in Wed Aug 7 13:36:42 2002
@@ -183,7 +183,7 @@ lib_LTLIBRARIES = libgthread-2.0.la
libgthread_2_0_la_SOURCES = gthread-impl.c
libgthread_2_0_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -version-info $(LIBGTHREAD_VERSION) \
-export-dynamic $(no_undefined) $(export_symbols)

4
devel/glib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/07/25 09:14:13 nino Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/08/07 13:11:53 nino Exp $
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@ -87,6 +87,7 @@ share/aclocal/glib-gettext.m4
share/glib-2.0/gettext/po/Makefile.in.in
share/locale/ar/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/bg/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/cs/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
@ -111,6 +112,7 @@ share/locale/sv/LC_MESSAGES/glib20.mo
share/locale/ta/LC_MESSAGES/glib20.mo
share/locale/tr/LC_MESSAGES/glib20.mo
share/locale/uk/LC_MESSAGES/glib20.mo
share/locale/vi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
%%SHARED%%