mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Update to 1.3.12 and merge in dlsym() patches from gtk12 port.
This commit is contained in:
parent
ddc0d30e5d
commit
e8da18edcd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=53291
14 changed files with 186 additions and 108 deletions
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= glib
|
PORTNAME= glib
|
||||||
PORTVERSION= 1.3.9
|
PORTVERSION= 1.3.12
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
|
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
|
||||||
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
|
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
|
||||||
|
@ -29,6 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||||
|
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
|
||||||
|
|
||||||
MAN1= glib-genmarshal.1 glib-mkenums.1
|
MAN1= glib-genmarshal.1 glib-mkenums.1
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0
|
MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3
|
||||||
|
|
|
@ -1,22 +1,9 @@
|
||||||
|
|
||||||
$FreeBSD$
|
$FreeBSD$
|
||||||
|
|
||||||
--- configure.orig Tue Sep 25 18:36:39 2001
|
--- configure.orig Mon Dec 24 00:50:12 2001
|
||||||
+++ configure Wed Oct 24 10:00:12 2001
|
+++ configure Fri Jan 18 09:40:30 2002
|
||||||
@@ -9924,6 +9924,12 @@
|
@@ -16354,8 +16354,8 @@
|
||||||
linux*)
|
|
||||||
G_MODULE_LDFLAGS='-rdynamic'
|
|
||||||
;;
|
|
||||||
+ freebsd*)
|
|
||||||
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
+ if test $objformat = "elf"; then
|
|
||||||
+ G_MODULE_LDFLAGS='-Wl,-E'
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
LIBS_orig="$LIBS"
|
|
||||||
LDFLAGS_orig="$LDFLAGS"
|
|
||||||
@@ -10472,8 +10478,8 @@
|
|
||||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -27,7 +14,7 @@ $FreeBSD$
|
||||||
|
|
||||||
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
||||||
# -mthreads flag.
|
# -mthreads flag.
|
||||||
@@ -10553,13 +10559,13 @@
|
@@ -16433,13 +16433,13 @@
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -44,38 +31,29 @@ $FreeBSD$
|
||||||
fi
|
fi
|
||||||
if test x"$have_threads" = xposix; then
|
if test x"$have_threads" = xposix; then
|
||||||
defattr=0
|
defattr=0
|
||||||
@@ -11058,6 +11064,7 @@
|
@@ -17636,13 +17636,13 @@
|
||||||
if test "$cross_compiling" = yes; then
|
|
||||||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
||||||
else
|
|
||||||
+# LIBS="-lgiconv $LIBS"
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
|
||||||
#line 11063 "configure"
|
|
||||||
#include "confdefs.h"
|
|
||||||
@@ -11516,14 +11523,14 @@
|
|
||||||
#
|
#
|
||||||
# Check for libiconv
|
# Check for libiconv
|
||||||
#
|
#
|
||||||
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
|
- echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
|
||||||
-echo "configure:11521: checking for libiconv_open in -liconv" >&5
|
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
|
||||||
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
|
+ echo "$as_me:17639: checking for libiconv_open in -lgiconv" >&5
|
||||||
+echo "configure:11521: checking for libiconv_open in -lgiconv" >&5
|
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
|
||||||
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
|
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
else
|
||||||
ac_save_LIBS="$LIBS"
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
-LIBS="-liconv $LIBS"
|
-LIBS="-liconv $LIBS"
|
||||||
+LIBS="-lgiconv $LIBS"
|
+LIBS="-lgiconv $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
#line 11529 "configure"
|
#line 17647 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
@@ -11563,7 +11570,7 @@
|
@@ -17704,7 +17704,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_libiconv" = "xyes" ; then
|
if test "x$with_libiconv" = "xyes" ; then
|
||||||
- ICONV_LIBS="-liconv"
|
- ICONV_LIBS="-liconv"
|
||||||
+ ICONV_LIBS="-lgiconv"
|
+ ICONV_LIBS="-lgiconv"
|
||||||
cat >> confdefs.h <<\EOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define USE_LIBICONV 1
|
#define USE_LIBICONV 1
|
||||||
EOF
|
_ACEOF
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
|
|
||||||
$FreeBSD$
|
$FreeBSD$
|
||||||
|
|
||||||
--- Makefile.in.orig Wed Oct 24 10:00:39 2001
|
--- Makefile.in.orig Fri Jan 18 09:43:54 2002
|
||||||
+++ Makefile.in Wed Oct 24 10:01:07 2001
|
+++ Makefile.in Fri Jan 18 09:45:49 2002
|
||||||
@@ -147,7 +147,7 @@
|
@@ -149,7 +149,7 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.4
|
AUTOMAKE_OPTIONS = 1.4
|
||||||
|
|
||||||
-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
|
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
|
||||||
+SUBDIRS = . m4macros glib gobject gmodule gthread docs build po
|
+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
|
||||||
|
|
||||||
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
|
bin_SCRIPTS = glib-gettextize
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@
|
@@ -191,7 +191,7 @@
|
||||||
BUILT_EXTRA_DIST = glibconfig.h.win32 config.h.win32 glib.spec
|
glib-zip
|
||||||
|
|
||||||
|
|
||||||
-configexecincludedir = $(libdir)/glib-2.0/include
|
-configexecincludedir = $(libdir)/glib-2.0/include
|
||||||
|
|
25
devel/glib13/files/patch-glib::libcharset::Makefile.in
Normal file
25
devel/glib13/files/patch-glib::libcharset::Makefile.in
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
|
||||||
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- glib/libcharset/Makefile.in 2002/01/18 08:04:15 1.1
|
||||||
|
+++ glib/libcharset/Makefile.in 2002/01/18 08:13:49
|
||||||
|
@@ -148,7 +148,7 @@
|
||||||
|
ms_librarian = @ms_librarian@
|
||||||
|
|
||||||
|
INCLUDES = \
|
||||||
|
- -DLIBDIR=\"$(libdir)\"
|
||||||
|
+ -DLIBDIR=\"$(prefix)/libdata\"
|
||||||
|
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libcharset.la
|
||||||
|
@@ -172,8 +172,8 @@
|
||||||
|
make-patch.sh
|
||||||
|
|
||||||
|
|
||||||
|
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
|
||||||
|
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
|
||||||
|
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
|
||||||
|
+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
|
||||||
|
|
||||||
|
SUFFIXES = .sed .sin
|
||||||
|
|
23
devel/glib13/files/patch-gmodule::gmodule-dl.c
Normal file
23
devel/glib13/files/patch-gmodule::gmodule-dl.c
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
|
||||||
|
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
|
||||||
|
@@ -104,6 +104,7 @@
|
||||||
|
static gpointer
|
||||||
|
_g_module_self (void)
|
||||||
|
{
|
||||||
|
+#ifndef __FreeBSD__
|
||||||
|
gpointer handle;
|
||||||
|
|
||||||
|
/* to query symbols from the program itself, special link options
|
||||||
|
@@ -115,6 +116,9 @@
|
||||||
|
g_module_set_error (fetch_dlerror (TRUE));
|
||||||
|
|
||||||
|
return handle;
|
||||||
|
+#else
|
||||||
|
+ return RTLD_DEFAULT;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
|
@ -1,4 +1,5 @@
|
||||||
bin/glib-genmarshal
|
bin/glib-genmarshal
|
||||||
|
bin/glib-gettextize
|
||||||
bin/glib-mkenums
|
bin/glib-mkenums
|
||||||
bin/gobject-query
|
bin/gobject-query
|
||||||
include/glib-2.0/glib-object.h
|
include/glib-2.0/glib-object.h
|
||||||
|
@ -12,6 +13,7 @@ include/glib-2.0/glib/gcompletion.h
|
||||||
include/glib-2.0/glib/gconvert.h
|
include/glib-2.0/glib/gconvert.h
|
||||||
include/glib-2.0/glib/gdataset.h
|
include/glib-2.0/glib/gdataset.h
|
||||||
include/glib-2.0/glib/gdate.h
|
include/glib-2.0/glib/gdate.h
|
||||||
|
include/glib-2.0/glib/gdir.h
|
||||||
include/glib-2.0/glib/gerror.h
|
include/glib-2.0/glib/gerror.h
|
||||||
include/glib-2.0/glib/gfileutils.h
|
include/glib-2.0/glib/gfileutils.h
|
||||||
include/glib-2.0/glib/ghash.h
|
include/glib-2.0/glib/ghash.h
|
||||||
|
@ -66,30 +68,36 @@ include/glib-2.0/gobject/gvaluecollector.h
|
||||||
include/glib-2.0/gobject/gvaluetypes.h
|
include/glib-2.0/gobject/gvaluetypes.h
|
||||||
lib/libglib-1.3.a
|
lib/libglib-1.3.a
|
||||||
lib/libglib-1.3.so
|
lib/libglib-1.3.so
|
||||||
lib/libglib-1.3.so.9
|
lib/libglib-1.3.so.12
|
||||||
lib/libgmodule-1.3.a
|
lib/libgmodule-1.3.a
|
||||||
lib/libgmodule-1.3.so
|
lib/libgmodule-1.3.so
|
||||||
lib/libgmodule-1.3.so.9
|
lib/libgmodule-1.3.so.12
|
||||||
lib/libgobject-1.3.a
|
lib/libgobject-1.3.a
|
||||||
lib/libgobject-1.3.so
|
lib/libgobject-1.3.so
|
||||||
lib/libgobject-1.3.so.9
|
lib/libgobject-1.3.so.12
|
||||||
lib/libgthread-1.3.a
|
lib/libgthread-1.3.a
|
||||||
lib/libgthread-1.3.so
|
lib/libgthread-1.3.so
|
||||||
lib/libgthread-1.3.so.9
|
lib/libgthread-1.3.so.12
|
||||||
libdata/pkgconfig/glib-2.0.pc
|
libdata/pkgconfig/glib-2.0.pc
|
||||||
libdata/pkgconfig/gmodule-2.0.pc
|
libdata/pkgconfig/gmodule-2.0.pc
|
||||||
libdata/pkgconfig/gobject-2.0.pc
|
libdata/pkgconfig/gobject-2.0.pc
|
||||||
libdata/pkgconfig/gthread-2.0.pc
|
libdata/pkgconfig/gthread-2.0.pc
|
||||||
share/aclocal/glib-2.0.m4
|
share/aclocal/glib-2.0.m4
|
||||||
share/aclocal/glib-gettext.m4
|
share/aclocal/glib-gettext.m4
|
||||||
|
share/glib-2.0/gettext/po/Makefile.in.in
|
||||||
|
share/glib-2.0/gettext/po/po2tbl.sed.in
|
||||||
share/locale/az/LC_MESSAGES/glib20.mo
|
share/locale/az/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ca/LC_MESSAGES/glib20.mo
|
share/locale/ca/LC_MESSAGES/glib20.mo
|
||||||
share/locale/de/LC_MESSAGES/glib20.mo
|
share/locale/de/LC_MESSAGES/glib20.mo
|
||||||
share/locale/es/LC_MESSAGES/glib20.mo
|
share/locale/es/LC_MESSAGES/glib20.mo
|
||||||
share/locale/eu/LC_MESSAGES/glib20.mo
|
share/locale/eu/LC_MESSAGES/glib20.mo
|
||||||
share/locale/fr/LC_MESSAGES/glib20.mo
|
share/locale/fr/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/gl/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/ja/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/nl/LC_MESSAGES/glib20.mo
|
||||||
share/locale/nn/LC_MESSAGES/glib20.mo
|
share/locale/nn/LC_MESSAGES/glib20.mo
|
||||||
share/locale/no/LC_MESSAGES/glib20.mo
|
share/locale/no/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/ro/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ru/LC_MESSAGES/glib20.mo
|
share/locale/ru/LC_MESSAGES/glib20.mo
|
||||||
share/locale/sk/LC_MESSAGES/glib20.mo
|
share/locale/sk/LC_MESSAGES/glib20.mo
|
||||||
share/locale/sl/LC_MESSAGES/glib20.mo
|
share/locale/sl/LC_MESSAGES/glib20.mo
|
||||||
|
@ -97,7 +105,11 @@ share/locale/sv/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ta/LC_MESSAGES/glib20.mo
|
share/locale/ta/LC_MESSAGES/glib20.mo
|
||||||
share/locale/tr/LC_MESSAGES/glib20.mo
|
share/locale/tr/LC_MESSAGES/glib20.mo
|
||||||
share/locale/uk/LC_MESSAGES/glib20.mo
|
share/locale/uk/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/zh_CN/LC_MESSAGES/glib20.mo
|
||||||
share/locale/zh_TW/LC_MESSAGES/glib20.mo
|
share/locale/zh_TW/LC_MESSAGES/glib20.mo
|
||||||
|
@dirrm share/glib-2.0/gettext/po
|
||||||
|
@dirrm share/glib-2.0/gettext
|
||||||
|
@dirrm share/glib-2.0
|
||||||
@dirrm include/glib-2.0/gobject
|
@dirrm include/glib-2.0/gobject
|
||||||
@dirrm include/glib-2.0/glib
|
@dirrm include/glib-2.0/glib
|
||||||
@dirrm include/glib-2.0
|
@dirrm include/glib-2.0
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= glib
|
PORTNAME= glib
|
||||||
PORTVERSION= 1.3.9
|
PORTVERSION= 1.3.12
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
|
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
|
||||||
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
|
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
|
||||||
|
@ -29,6 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||||
|
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
|
||||||
|
|
||||||
MAN1= glib-genmarshal.1 glib-mkenums.1
|
MAN1= glib-genmarshal.1 glib-mkenums.1
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0
|
MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3
|
||||||
|
|
|
@ -1,22 +1,9 @@
|
||||||
|
|
||||||
$FreeBSD$
|
$FreeBSD$
|
||||||
|
|
||||||
--- configure.orig Tue Sep 25 18:36:39 2001
|
--- configure.orig Mon Dec 24 00:50:12 2001
|
||||||
+++ configure Wed Oct 24 10:00:12 2001
|
+++ configure Fri Jan 18 09:40:30 2002
|
||||||
@@ -9924,6 +9924,12 @@
|
@@ -16354,8 +16354,8 @@
|
||||||
linux*)
|
|
||||||
G_MODULE_LDFLAGS='-rdynamic'
|
|
||||||
;;
|
|
||||||
+ freebsd*)
|
|
||||||
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
|
||||||
+ if test $objformat = "elf"; then
|
|
||||||
+ G_MODULE_LDFLAGS='-Wl,-E'
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
esac
|
|
||||||
LIBS_orig="$LIBS"
|
|
||||||
LDFLAGS_orig="$LDFLAGS"
|
|
||||||
@@ -10472,8 +10478,8 @@
|
|
||||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -27,7 +14,7 @@ $FreeBSD$
|
||||||
|
|
||||||
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
||||||
# -mthreads flag.
|
# -mthreads flag.
|
||||||
@@ -10553,13 +10559,13 @@
|
@@ -16433,13 +16433,13 @@
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -44,38 +31,29 @@ $FreeBSD$
|
||||||
fi
|
fi
|
||||||
if test x"$have_threads" = xposix; then
|
if test x"$have_threads" = xposix; then
|
||||||
defattr=0
|
defattr=0
|
||||||
@@ -11058,6 +11064,7 @@
|
@@ -17636,13 +17636,13 @@
|
||||||
if test "$cross_compiling" = yes; then
|
|
||||||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
||||||
else
|
|
||||||
+# LIBS="-lgiconv $LIBS"
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
|
||||||
#line 11063 "configure"
|
|
||||||
#include "confdefs.h"
|
|
||||||
@@ -11516,14 +11523,14 @@
|
|
||||||
#
|
#
|
||||||
# Check for libiconv
|
# Check for libiconv
|
||||||
#
|
#
|
||||||
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
|
- echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
|
||||||
-echo "configure:11521: checking for libiconv_open in -liconv" >&5
|
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
|
||||||
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
|
+ echo "$as_me:17639: checking for libiconv_open in -lgiconv" >&5
|
||||||
+echo "configure:11521: checking for libiconv_open in -lgiconv" >&5
|
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
|
||||||
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
|
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
else
|
||||||
ac_save_LIBS="$LIBS"
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
-LIBS="-liconv $LIBS"
|
-LIBS="-liconv $LIBS"
|
||||||
+LIBS="-lgiconv $LIBS"
|
+LIBS="-lgiconv $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
#line 11529 "configure"
|
#line 17647 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
@@ -11563,7 +11570,7 @@
|
@@ -17704,7 +17704,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_libiconv" = "xyes" ; then
|
if test "x$with_libiconv" = "xyes" ; then
|
||||||
- ICONV_LIBS="-liconv"
|
- ICONV_LIBS="-liconv"
|
||||||
+ ICONV_LIBS="-lgiconv"
|
+ ICONV_LIBS="-lgiconv"
|
||||||
cat >> confdefs.h <<\EOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define USE_LIBICONV 1
|
#define USE_LIBICONV 1
|
||||||
EOF
|
_ACEOF
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
|
|
||||||
$FreeBSD$
|
$FreeBSD$
|
||||||
|
|
||||||
--- Makefile.in.orig Wed Oct 24 10:00:39 2001
|
--- Makefile.in.orig Fri Jan 18 09:43:54 2002
|
||||||
+++ Makefile.in Wed Oct 24 10:01:07 2001
|
+++ Makefile.in Fri Jan 18 09:45:49 2002
|
||||||
@@ -147,7 +147,7 @@
|
@@ -149,7 +149,7 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.4
|
AUTOMAKE_OPTIONS = 1.4
|
||||||
|
|
||||||
-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
|
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
|
||||||
+SUBDIRS = . m4macros glib gobject gmodule gthread docs build po
|
+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
|
||||||
|
|
||||||
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
|
bin_SCRIPTS = glib-gettextize
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@
|
@@ -191,7 +191,7 @@
|
||||||
BUILT_EXTRA_DIST = glibconfig.h.win32 config.h.win32 glib.spec
|
glib-zip
|
||||||
|
|
||||||
|
|
||||||
-configexecincludedir = $(libdir)/glib-2.0/include
|
-configexecincludedir = $(libdir)/glib-2.0/include
|
||||||
|
|
25
devel/glib20/files/patch-glib::libcharset::Makefile.in
Normal file
25
devel/glib20/files/patch-glib::libcharset::Makefile.in
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
|
||||||
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- glib/libcharset/Makefile.in 2002/01/18 08:04:15 1.1
|
||||||
|
+++ glib/libcharset/Makefile.in 2002/01/18 08:13:49
|
||||||
|
@@ -148,7 +148,7 @@
|
||||||
|
ms_librarian = @ms_librarian@
|
||||||
|
|
||||||
|
INCLUDES = \
|
||||||
|
- -DLIBDIR=\"$(libdir)\"
|
||||||
|
+ -DLIBDIR=\"$(prefix)/libdata\"
|
||||||
|
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libcharset.la
|
||||||
|
@@ -172,8 +172,8 @@
|
||||||
|
make-patch.sh
|
||||||
|
|
||||||
|
|
||||||
|
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
|
||||||
|
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
|
||||||
|
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
|
||||||
|
+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
|
||||||
|
|
||||||
|
SUFFIXES = .sed .sin
|
||||||
|
|
23
devel/glib20/files/patch-gmodule::gmodule-dl.c
Normal file
23
devel/glib20/files/patch-gmodule::gmodule-dl.c
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
$FreeBSD$
|
||||||
|
|
||||||
|
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
|
||||||
|
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
|
||||||
|
@@ -104,6 +104,7 @@
|
||||||
|
static gpointer
|
||||||
|
_g_module_self (void)
|
||||||
|
{
|
||||||
|
+#ifndef __FreeBSD__
|
||||||
|
gpointer handle;
|
||||||
|
|
||||||
|
/* to query symbols from the program itself, special link options
|
||||||
|
@@ -115,6 +116,9 @@
|
||||||
|
g_module_set_error (fetch_dlerror (TRUE));
|
||||||
|
|
||||||
|
return handle;
|
||||||
|
+#else
|
||||||
|
+ return RTLD_DEFAULT;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
|
@ -1,4 +1,5 @@
|
||||||
bin/glib-genmarshal
|
bin/glib-genmarshal
|
||||||
|
bin/glib-gettextize
|
||||||
bin/glib-mkenums
|
bin/glib-mkenums
|
||||||
bin/gobject-query
|
bin/gobject-query
|
||||||
include/glib-2.0/glib-object.h
|
include/glib-2.0/glib-object.h
|
||||||
|
@ -12,6 +13,7 @@ include/glib-2.0/glib/gcompletion.h
|
||||||
include/glib-2.0/glib/gconvert.h
|
include/glib-2.0/glib/gconvert.h
|
||||||
include/glib-2.0/glib/gdataset.h
|
include/glib-2.0/glib/gdataset.h
|
||||||
include/glib-2.0/glib/gdate.h
|
include/glib-2.0/glib/gdate.h
|
||||||
|
include/glib-2.0/glib/gdir.h
|
||||||
include/glib-2.0/glib/gerror.h
|
include/glib-2.0/glib/gerror.h
|
||||||
include/glib-2.0/glib/gfileutils.h
|
include/glib-2.0/glib/gfileutils.h
|
||||||
include/glib-2.0/glib/ghash.h
|
include/glib-2.0/glib/ghash.h
|
||||||
|
@ -66,30 +68,36 @@ include/glib-2.0/gobject/gvaluecollector.h
|
||||||
include/glib-2.0/gobject/gvaluetypes.h
|
include/glib-2.0/gobject/gvaluetypes.h
|
||||||
lib/libglib-1.3.a
|
lib/libglib-1.3.a
|
||||||
lib/libglib-1.3.so
|
lib/libglib-1.3.so
|
||||||
lib/libglib-1.3.so.9
|
lib/libglib-1.3.so.12
|
||||||
lib/libgmodule-1.3.a
|
lib/libgmodule-1.3.a
|
||||||
lib/libgmodule-1.3.so
|
lib/libgmodule-1.3.so
|
||||||
lib/libgmodule-1.3.so.9
|
lib/libgmodule-1.3.so.12
|
||||||
lib/libgobject-1.3.a
|
lib/libgobject-1.3.a
|
||||||
lib/libgobject-1.3.so
|
lib/libgobject-1.3.so
|
||||||
lib/libgobject-1.3.so.9
|
lib/libgobject-1.3.so.12
|
||||||
lib/libgthread-1.3.a
|
lib/libgthread-1.3.a
|
||||||
lib/libgthread-1.3.so
|
lib/libgthread-1.3.so
|
||||||
lib/libgthread-1.3.so.9
|
lib/libgthread-1.3.so.12
|
||||||
libdata/pkgconfig/glib-2.0.pc
|
libdata/pkgconfig/glib-2.0.pc
|
||||||
libdata/pkgconfig/gmodule-2.0.pc
|
libdata/pkgconfig/gmodule-2.0.pc
|
||||||
libdata/pkgconfig/gobject-2.0.pc
|
libdata/pkgconfig/gobject-2.0.pc
|
||||||
libdata/pkgconfig/gthread-2.0.pc
|
libdata/pkgconfig/gthread-2.0.pc
|
||||||
share/aclocal/glib-2.0.m4
|
share/aclocal/glib-2.0.m4
|
||||||
share/aclocal/glib-gettext.m4
|
share/aclocal/glib-gettext.m4
|
||||||
|
share/glib-2.0/gettext/po/Makefile.in.in
|
||||||
|
share/glib-2.0/gettext/po/po2tbl.sed.in
|
||||||
share/locale/az/LC_MESSAGES/glib20.mo
|
share/locale/az/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ca/LC_MESSAGES/glib20.mo
|
share/locale/ca/LC_MESSAGES/glib20.mo
|
||||||
share/locale/de/LC_MESSAGES/glib20.mo
|
share/locale/de/LC_MESSAGES/glib20.mo
|
||||||
share/locale/es/LC_MESSAGES/glib20.mo
|
share/locale/es/LC_MESSAGES/glib20.mo
|
||||||
share/locale/eu/LC_MESSAGES/glib20.mo
|
share/locale/eu/LC_MESSAGES/glib20.mo
|
||||||
share/locale/fr/LC_MESSAGES/glib20.mo
|
share/locale/fr/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/gl/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/ja/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/nl/LC_MESSAGES/glib20.mo
|
||||||
share/locale/nn/LC_MESSAGES/glib20.mo
|
share/locale/nn/LC_MESSAGES/glib20.mo
|
||||||
share/locale/no/LC_MESSAGES/glib20.mo
|
share/locale/no/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/ro/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ru/LC_MESSAGES/glib20.mo
|
share/locale/ru/LC_MESSAGES/glib20.mo
|
||||||
share/locale/sk/LC_MESSAGES/glib20.mo
|
share/locale/sk/LC_MESSAGES/glib20.mo
|
||||||
share/locale/sl/LC_MESSAGES/glib20.mo
|
share/locale/sl/LC_MESSAGES/glib20.mo
|
||||||
|
@ -97,7 +105,11 @@ share/locale/sv/LC_MESSAGES/glib20.mo
|
||||||
share/locale/ta/LC_MESSAGES/glib20.mo
|
share/locale/ta/LC_MESSAGES/glib20.mo
|
||||||
share/locale/tr/LC_MESSAGES/glib20.mo
|
share/locale/tr/LC_MESSAGES/glib20.mo
|
||||||
share/locale/uk/LC_MESSAGES/glib20.mo
|
share/locale/uk/LC_MESSAGES/glib20.mo
|
||||||
|
share/locale/zh_CN/LC_MESSAGES/glib20.mo
|
||||||
share/locale/zh_TW/LC_MESSAGES/glib20.mo
|
share/locale/zh_TW/LC_MESSAGES/glib20.mo
|
||||||
|
@dirrm share/glib-2.0/gettext/po
|
||||||
|
@dirrm share/glib-2.0/gettext
|
||||||
|
@dirrm share/glib-2.0
|
||||||
@dirrm include/glib-2.0/gobject
|
@dirrm include/glib-2.0/gobject
|
||||||
@dirrm include/glib-2.0/glib
|
@dirrm include/glib-2.0/glib
|
||||||
@dirrm include/glib-2.0
|
@dirrm include/glib-2.0
|
||||||
|
|
Loading…
Add table
Reference in a new issue