upgrade to glib 1.2.9
!!NOTE!!: header files for glib have changed locations so this WILL cause breakage.
This commit is contained in:
parent
b796668641
commit
a662adb27c
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2000/11/11 21:53:30 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2001/03/07 22:51:22 brad Exp $
|
||||
|
||||
.if ${MACHINE_ARCH} == "powerpc"
|
||||
BROKEN= "BROKEN on powerpc: reason unknown at the moment"
|
||||
.endif
|
||||
|
||||
DISTNAME= glib-1.2.8
|
||||
DISTNAME= glib-1.2.9
|
||||
CATEGORIES= devel
|
||||
NEED_VERSION= 1.336
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
|
||||
@ -23,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static --includedir="${PREFIX}/include/glib"
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
|
||||
FLAVORS= threads
|
||||
FLAVOR?=
|
||||
@ -40,8 +40,4 @@ CONFIGURE_ARGS+= --disable-threads
|
||||
post-extract:
|
||||
@rm -f ${WRKSRC}/docs/glib.info*
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
|
||||
${INSTALL_DATA} ${WRKSRC}/glib.m4 ${PREFIX}/share/aclocal
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (glib-1.2.8.tar.gz) = 5965aeb7894f3ab3b9b7c5833418bfe9
|
||||
RMD160 (glib-1.2.8.tar.gz) = abc39dbe88cbe8fce64040fd12ef5a5b63e063d4
|
||||
SHA1 (glib-1.2.8.tar.gz) = 189f2549b81f2d9e1dd21e574c34e708439c9e13
|
||||
MD5 (glib-1.2.9.tar.gz) = 1c6ae6a0e68fbbc2d91a0c8a495238cd
|
||||
RMD160 (glib-1.2.9.tar.gz) = 6fb306a91f697a3a6176844cca4470803bc1fee6
|
||||
SHA1 (glib-1.2.9.tar.gz) = e6ba39ec60ae5a913c075df2735bff5265e8f3a1
|
||||
|
@ -1,16 +1,15 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2001/02/19 20:34:46 danh Exp $
|
||||
--- Makefile.in.orig Wed May 24 21:06:06 2000
|
||||
+++ Makefile.in Mon Feb 19 15:32:17 2001
|
||||
@@ -97,7 +97,7 @@ AUTOMAKE_OPTIONS = 1.4
|
||||
--- Makefile.in.orig Fri Mar 2 12:37:20 2001
|
||||
+++ Makefile.in Wed Mar 7 08:45:42 2001
|
||||
@@ -98,7 +98,7 @@
|
||||
|
||||
SUBDIRS = . gmodule gthread docs tests
|
||||
|
||||
-configincludedir = $(pkglibdir)/include
|
||||
+configincludedir = $(includedir)
|
||||
+configincludedir = $(includedir)/glib-1.2
|
||||
|
||||
bin_SCRIPTS = glib-config
|
||||
|
||||
@@ -121,7 +121,7 @@ configinclude_DATA = glibconfig.h
|
||||
@@ -123,7 +123,7 @@
|
||||
|
||||
CONFIGURE_DEPENDENCIES = acglib.m4
|
||||
|
||||
@ -19,9 +18,9 @@ $OpenBSD: patch-Makefile_in,v 1.1 2001/02/19 20:34:46 danh Exp $
|
||||
|
||||
|
||||
noinst_PROGRAMS = testglib testgdate testgdateparser
|
||||
@@ -570,7 +570,7 @@ uninstall-am: uninstall-libLTLIBRARIES u
|
||||
@@ -629,7 +629,7 @@
|
||||
uninstall-configincludeDATA uninstall-m4dataDATA \
|
||||
uninstall-includeHEADERS
|
||||
uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
|
||||
uninstall: uninstall-recursive
|
||||
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
|
||||
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
--- configure.orig Wed May 24 20:30:06 2000
|
||||
+++ configure Mon Feb 19 15:32:17 2001
|
||||
@@ -4836,7 +4836,7 @@ LIBS="$ac_save_LIBS"
|
||||
$OpenBSD: patch-configure,v 1.2 2001/03/07 22:51:24 brad Exp $
|
||||
--- configure.orig Wed Feb 28 16:57:36 2001
|
||||
+++ configure Tue Mar 6 12:56:09 2001
|
||||
@@ -4910,7 +4910,7 @@
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-docs_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
--- docs/Makefile.in.orig Wed May 24 21:06:08 2000
|
||||
+++ docs/Makefile.in Mon Feb 19 15:32:17 2001
|
||||
@@ -85,7 +85,7 @@ LT_CURRENT = @LT_CURRENT@
|
||||
$OpenBSD: patch-docs_Makefile_in,v 1.2 2001/03/07 22:51:24 brad Exp $
|
||||
--- docs/Makefile.in.orig Fri Mar 2 12:37:22 2001
|
||||
+++ docs/Makefile.in Tue Mar 6 12:57:11 2001
|
||||
@@ -86,7 +86,7 @@
|
||||
LT_RELEASE = @LT_RELEASE@
|
||||
LT_REVISION = @LT_REVISION@
|
||||
MAINT = @MAINT@
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-docs_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
@@ -135,46 +135,40 @@ glib.dvi: glib.texi
|
||||
@@ -136,46 +136,40 @@
|
||||
DVIPS = dvips
|
||||
|
||||
.texi.info:
|
||||
@ -69,7 +69,7 @@ $OpenBSD: patch-docs_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
.dvi.ps:
|
||||
$(DVIPS) $< -o $@
|
||||
|
||||
@@ -183,11 +177,10 @@ install-info-am: $(INFO_DEPS)
|
||||
@@ -184,11 +178,10 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(infodir)
|
||||
@list='$(INFO_DEPS)'; \
|
||||
for file in $$list; do \
|
||||
|
@ -1,12 +1,11 @@
|
||||
$OpenBSD: patch-glib-config_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
--- glib-config.in.orig Tue Dec 15 20:29:18 1998
|
||||
+++ glib-config.in Mon Feb 19 15:32:17 2001
|
||||
@@ -91,7 +91,7 @@ if test "$echo_cflags" = "yes"; then
|
||||
--- glib-config.in.orig Sat Oct 28 00:35:30 2000
|
||||
+++ glib-config.in Wed Mar 7 08:46:18 2001
|
||||
@@ -88,7 +88,7 @@
|
||||
if test "$lib_gthread" = "yes"; then
|
||||
cflags="$cflags @G_THREAD_CFLAGS@"
|
||||
fi
|
||||
- echo -I@libdir@/glib/include $includes $cflags
|
||||
+ echo $includes $cflags
|
||||
- echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
|
||||
+ echo -I@includedir@/glib-1.2 $includes $cflags
|
||||
fi
|
||||
if test "$echo_libs" = "yes"; then
|
||||
libsp=""
|
||||
|
@ -1,7 +1,6 @@
|
||||
$OpenBSD: patch-gmodule_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
--- gmodule/Makefile.in.orig Wed May 24 21:06:07 2000
|
||||
+++ gmodule/Makefile.in Mon Feb 19 15:32:17 2001
|
||||
@@ -107,7 +107,7 @@ libglib = $(top_builddir)/libglib.la # -
|
||||
--- gmodule/Makefile.in.orig Fri Mar 2 12:37:21 2001
|
||||
+++ gmodule/Makefile.in Wed Mar 7 08:49:08 2001
|
||||
@@ -109,7 +109,7 @@
|
||||
lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
|
||||
|
||||
libgmodule_la_SOURCES = gmodule.c
|
||||
@ -10,9 +9,9 @@ $OpenBSD: patch-gmodule_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
|
||||
|
||||
libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
||||
@@ -331,7 +331,7 @@ install-am: all-am
|
||||
@@ -341,7 +341,7 @@
|
||||
install: install-am
|
||||
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
|
||||
uninstall-am: uninstall-libLTLIBRARIES uninstall-glibincludeHEADERS
|
||||
uninstall: uninstall-am
|
||||
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
|
||||
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
|
||||
|
@ -1,7 +1,6 @@
|
||||
$OpenBSD: patch-gthread_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
--- gthread/Makefile.in.orig Wed May 24 21:06:08 2000
|
||||
+++ gthread/Makefile.in Mon Feb 19 15:32:17 2001
|
||||
@@ -101,7 +101,7 @@ libglib = $(top_builddir)/libglib.la # -
|
||||
--- gthread/Makefile.in.orig Tue Mar 6 13:10:30 2001
|
||||
+++ gthread/Makefile.in Tue Mar 6 13:11:08 2001
|
||||
@@ -102,7 +102,7 @@
|
||||
lib_LTLIBRARIES = libgthread.la
|
||||
|
||||
libgthread_la_SOURCES = gthread.c
|
||||
@ -10,7 +9,7 @@ $OpenBSD: patch-gthread_Makefile_in,v 1.1 2001/02/19 20:34:47 danh Exp $
|
||||
|
||||
|
||||
libgthread_la_LIBADD = @G_THREAD_LIBS@
|
||||
@@ -295,7 +295,7 @@ install-am: all-am
|
||||
@@ -300,7 +300,7 @@
|
||||
install: install-am
|
||||
uninstall-am: uninstall-libLTLIBRARIES
|
||||
uninstall: uninstall-am
|
||||
|
@ -2,11 +2,4 @@ General-purpose library from the GTK+ team, includes support
|
||||
routines for C such as lists, trees, hashes, memory allocation, and
|
||||
many other things.
|
||||
|
||||
The official ftp site is:
|
||||
ftp://ftp.gtk.org/pub/gtk/
|
||||
|
||||
The official web site is:
|
||||
${HOMEPAGE}
|
||||
|
||||
A mailing list is located at:
|
||||
gtk-list@redhat.com
|
||||
WWW: ${HOMEPAGE}
|
||||
|
@ -1,8 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2000/06/11 17:54:04 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2001/03/07 22:51:24 brad Exp $
|
||||
bin/glib-config
|
||||
include/glib/glib.h
|
||||
include/glib/glibconfig.h
|
||||
include/glib/gmodule.h
|
||||
include/glib-1.2/glib.h
|
||||
include/glib-1.2/glibconfig.h
|
||||
include/glib-1.2/gmodule.h
|
||||
@unexec install-info --delete %D/info/glib.info %D/info/dir
|
||||
info/glib.info
|
||||
@exec install-info %D/info/glib.info %D/info/dir
|
||||
@ -15,4 +15,4 @@ lib/libgthread.la
|
||||
%%SHARED%%
|
||||
man/man1/glib-config.1
|
||||
share/aclocal/glib.m4
|
||||
@dirrm include/glib
|
||||
@dirrm include/glib-1.2
|
||||
|
Loading…
Reference in New Issue
Block a user