Date: Sun, 10 Mar 2002 12:20:02 -0800 (PST) From: Joe Clarke <marcus@marcuscom.com> To: gnome@FreeBSD.org Subject: Re: ports/35541: [PATCH] Update devel/glib13 to 1.3.1 Message-ID: <200203102020.g2AKK2k51574@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/35541; it has been noted by GNATS.
From: Joe Clarke <marcus@marcuscom.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/35541: [PATCH] Update devel/glib13 to 1.3.1
Date: 10 Mar 2002 15:10:08 -0500
--=-C/3rRYyHSXn50EqbX2TK
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
These patches update glib to the GNOME2 beta2 release. The version
number for glib and gtk+ is now 2.0.0. Should we repo copy glib13 and
gtk13 to glib2 and gtk2, then delete the 13 dirs? This would keep
things more inline with the current GNOME trend.
In any event, it looks like archive library building has been disabled
by default. These patches reenable it in favor of the old style.=20
However, it would be trivial to remove the reenabling patch, then remove
the .a files from the plist.
--- Makefile.orig Sun Mar 10 15:04:07 2002
+++ Makefile Sun Mar 10 13:48:42 2002
@@ -6,9 +6,9 @@
#
=20
PORTNAME=3D glib
-PORTVERSION=3D 1.3.14
+PORTVERSION=3D 2.0.0
CATEGORIES=3D devel
-MASTER_SITES=3D ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2=
.0-desktop-beta,} \
+MASTER_SITES=3D ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2=
.0-desktop-beta2,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
--- distinfo.orig Sun Mar 10 15:04:13 2002
+++ distinfo Sun Mar 10 13:49:54 2002
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.14.tar.bz2) =3D 8bf2f7584928ce5edef30542ee9407d7
+MD5 (gnome2/glib-2.0.0.tar.bz2) =3D dd9d482ec739a41710080ee136f96444
--- pkg-plist.orig Sun Mar 10 15:04:20 2002
+++ pkg-plist Sun Mar 10 15:03:02 2002
@@ -66,18 +66,19 @@
include/glib-2.0/gobject/gvaluearray.h
include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
-lib/libglib-1.3.a
-lib/libglib-1.3.so
-lib/libglib-1.3.so.14
-lib/libgmodule-1.3.a
-lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.14
-lib/libgobject-1.3.a
-lib/libgobject-1.3.so
-lib/libgobject-1.3.so.14
-lib/libgthread-1.3.a
-lib/libgthread-1.3.so
-lib/libgthread-1.3.so.14
+lib/libglib-2.0.a
+lib/libglib-2.0.so
+lib/libglib-2.0.so.0
+lib/libgmodule-2.0.a
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
+lib/libgobject-2.0.a
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
+lib/libgthread-2.0.a
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
+libdata/charset.alias
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
@@ -88,6 +89,7 @@
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/el/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/eu/LC_MESSAGES/glib20.mo
share/locale/fr/LC_MESSAGES/glib20.mo
--- files/patch-ae.orig Sun Mar 10 15:04:28 2002
+++ files/patch-ae Sun Mar 10 14:55:54 2002
@@ -1,9 +1,15 @@
-
-$FreeBSD: ports/devel/glib13/files/patch-ae,v 1.21 2002/02/27 11:20:57 sob=
omax Exp $
-
---- configure.orig Fri Feb 15 18:43:40 2002
-+++ configure Wed Feb 27 09:37:41 2002
-@@ -16692,8 +16692,8 @@
+--- configure.orig Fri Mar 8 10:54:21 2002
++++ configure Sun Mar 10 14:55:51 2002
+@@ -6223,7 +6223,7 @@
+ ;;
+ esac
+ else
+- enable_static=3Dno
++ enable_static=3Dyes
+ fi;
+=20
+ # Check whether --enable-shared or --disable-shared was given.
+@@ -16768,8 +16768,8 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
;;
@@ -14,12 +20,12 @@
=20
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
# -mthreads flag.
-@@ -16771,13 +16771,13 @@
- fi
+@@ -16852,13 +16852,13 @@
+ G_THREAD_LIBS=3D"-pthread"
;;
*)
-- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
-+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thr=
ead dce; do
+- for thread_lib in "" pthread pthread32 pthreads thread dce; do
++ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads thread =
dce; do
if test x"$thread_lib" =3D x; then
add_thread_lib=3D""
IN=3D""
@@ -31,13 +37,13 @@
fi
if test x"$have_threads" =3D xposix; then
defattr=3D0
-@@ -17974,13 +17974,13 @@
- #
- # Check for libiconv
- #
-- echo "$as_me:17977: checking for libiconv_open in -liconv" >&5
+@@ -18048,13 +18048,13 @@
+=20
+ # Check if we have GNU libiconv
+ if test $found_iconv =3D "no"; then
+- echo "$as_me:18051: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+ echo "$as_me:17977: checking for libiconv_open in -lgiconv" >&5
++ echo "$as_me:18051: checking for libiconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_libiconv_open+set}" =3D set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,14 +52,65 @@
-LIBS=3D"-liconv $LIBS"
+LIBS=3D"-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line 17985 "configure"
+ #line 18059 "configure"
+ #include "confdefs.h"
+@@ -18110,13 +18110,13 @@
+ fi
+ # Check if we have a iconv in -liconv, possibly from vendor
+ if test $found_iconv =3D "no"; then
+- echo "$as_me:18113: checking for iconv_open in -liconv" >&5
+-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
++ echo "$as_me:18113: checking for iconv_open in -lgiconv" >&5
++echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_open+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=3D$LIBS
+-LIBS=3D"-liconv $LIBS"
++LIBS=3D"-lgiconv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18121 "configure"
+ #include "confdefs.h"
+@@ -18242,13 +18242,13 @@
+=20
+ ;;
+ gnu|yes)
+- echo "$as_me:18245: checking for libiconv_open in -liconv" >&5
+-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
++ echo "$as_me:18245: checking for libiconv_open in -lgiconv" >&5
++echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_libiconv_open+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=3D$LIBS
+-LIBS=3D"-liconv $LIBS"
++LIBS=3D"-lgiconv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18253 "configure"
+ #include "confdefs.h"
+@@ -18303,13 +18303,13 @@
+=20
+ ;;
+ native)
+- echo "$as_me:18306: checking for iconv_open in -liconv" >&5
+-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
++ echo "$as_me:18306: checking for iconv_open in -lgiconv" >&5
++echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_open+set}" =3D set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=3D$LIBS
+-LIBS=3D"-liconv $LIBS"
++LIBS=3D"-lgiconv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18314 "configure"
#include "confdefs.h"
-@@ -18042,7 +18042,7 @@
- fi
+@@ -18373,7 +18373,7 @@
=20
- if test "x$with_libiconv" =3D "xyes" ; then
-- ICONV_LIBS=3D"-liconv"
-+ ICONV_LIBS=3D"-lgiconv"
- cat >>confdefs.h <<\_ACEOF
- #define USE_LIBICONV 1
+ case $with_libiconv in
+ gnu)
+- ICONV_LIBS=3D"-liconv"
++ ICONV_LIBS=3D"-lgiconv"
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_LIBICONV_GNU Using GNU libiconv
_ACEOF
--=-C/3rRYyHSXn50EqbX2TK
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iEYEABECAAYFAjyLvZ8ACgkQb2iPiv4Uz4cPQQCfTsZzadmR+AXsWZXKztd8JUx3
JggAnjAoeW32GfjSOq8bdAFQZLmclm9S
=IGXd
-----END PGP SIGNATURE-----
--=-C/3rRYyHSXn50EqbX2TK--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203102020.g2AKK2k51574>