diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-24 08:23:29 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-24 08:23:29 +0000 |
commit | e559f704c0c9bf19fd0a2a5c5d07055bed25d357 (patch) | |
tree | fcc9ba9ee03f53da438feb077807e6039040e150 /devel/glib20 | |
parent | 9639101906011cbf398e91f8e5c05cc952237043 (diff) | |
download | ports-e559f704c0c9bf19fd0a2a5c5d07055bed25d357.tar.gz ports-e559f704c0c9bf19fd0a2a5c5d07055bed25d357.zip |
Notes
Diffstat (limited to 'devel/glib20')
-rw-r--r-- | devel/glib20/Makefile | 5 | ||||
-rw-r--r-- | devel/glib20/distinfo | 2 | ||||
-rw-r--r-- | devel/glib20/files/patch-ae | 26 | ||||
-rw-r--r-- | devel/glib20/files/patch-ag | 16 | ||||
-rw-r--r-- | devel/glib20/pkg-plist | 113 |
5 files changed, 91 insertions, 71 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7dd55b814ef2..eaa5328f3b04 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glib -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -38,4 +38,7 @@ pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' +post-install: + ${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0 + .include <bsd.port.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 07b4a299dd12..dfd3010393ae 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (glib-1.3.6.tar.gz) = fe116d632b3b628d8114ac5a56855722 +MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index e05693d07459..3b0ff24656f8 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Wed Jun 13 19:39:30 2001 -+++ configure Wed Aug 1 19:33:18 2001 -@@ -10018,6 +10018,12 @@ +--- configure.orig Tue Sep 25 18:36:39 2001 ++++ configure Wed Oct 24 10:00:12 2001 +@@ -9924,6 +9924,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -16,7 +16,7 @@ $FreeBSD$ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -10488,8 +10494,8 @@ +@@ -10472,8 +10478,8 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -27,7 +27,7 @@ $FreeBSD$ # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # -mthreads flag. -@@ -10569,13 +10575,13 @@ +@@ -10553,13 +10559,13 @@ fi ;; *) @@ -44,22 +44,22 @@ $FreeBSD$ fi if test x"$have_threads" = xposix; then defattr=0 -@@ -11114,6 +11120,7 @@ - if test "$cross_compiling" = yes; then +@@ -11058,6 +11064,7 @@ + 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 11119 "configure" + #line 11063 "configure" #include "confdefs.h" -@@ -11481,14 +11488,14 @@ +@@ -11516,14 +11523,14 @@ # # Check for libiconv # - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:11486: checking for libiconv_open in -liconv" >&5 +-echo "configure:11521: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:11521: checking for libiconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68,9 +68,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 11494 "configure" + #line 11529 "configure" #include "confdefs.h" -@@ -11528,7 +11535,7 @@ +@@ -11563,7 +11570,7 @@ fi if test "x$with_libiconv" = "xyes" ; then diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag index 6303062bd037..7fdde4ddb14b 100644 --- a/devel/glib20/files/patch-ag +++ b/devel/glib20/files/patch-ag @@ -1,23 +1,23 @@ $FreeBSD$ ---- Makefile.in.orig Wed Jul 18 15:45:33 2001 -+++ Makefile.in Wed Jul 18 15:47:24 2001 -@@ -136,7 +136,7 @@ +--- Makefile.in.orig Wed Oct 24 10:00:39 2001 ++++ Makefile.in Wed Oct 24 10:01:07 2001 +@@ -147,7 +147,7 @@ AUTOMAKE_OPTIONS = 1.4 --SUBDIRS = . m4macros gobject gmodule gthread docs tests build -+SUBDIRS = . m4macros gobject gmodule gthread docs build +-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po ++SUBDIRS = . m4macros glib gobject gmodule gthread docs build po INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -@@ -160,7 +160,7 @@ - glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gpattern.h gprimes.h gqsort.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h +@@ -159,7 +159,7 @@ + BUILT_EXTRA_DIST = glibconfig.h.win32 config.h.win32 glib.spec -configexecincludedir = $(libdir)/glib-2.0/include +configexecincludedir = $(glibincludedir) CONFIGURE_DEPENDENCIES = acglib.m4 - BUILT_SOURCES = glib-config-2.0 + diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 39abd777f072..67ca9bede6d8 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,41 +1,62 @@ -bin/glib-config-2.0 bin/glib-genmarshal bin/glib-mkenums bin/gobject-query -include/glib-2.0/galloca.h -include/glib-2.0/garray.h -include/glib-2.0/gasyncqueue.h -include/glib-2.0/gbacktrace.h -include/glib-2.0/gcache.h -include/glib-2.0/gcompletion.h -include/glib-2.0/gconvert.h -include/glib-2.0/gdataset.h -include/glib-2.0/gdate.h -include/glib-2.0/gerror.h -include/glib-2.0/gfileutils.h -include/glib-2.0/ghash.h -include/glib-2.0/ghook.h -include/glib-2.0/giochannel.h include/glib-2.0/glib-object.h include/glib-2.0/glib.h +include/glib-2.0/glib/galloca.h +include/glib-2.0/glib/garray.h +include/glib-2.0/glib/gasyncqueue.h +include/glib-2.0/glib/gbacktrace.h +include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gcompletion.h +include/glib-2.0/glib/gconvert.h +include/glib-2.0/glib/gdataset.h +include/glib-2.0/glib/gdate.h +include/glib-2.0/glib/gerror.h +include/glib-2.0/glib/gfileutils.h +include/glib-2.0/glib/ghash.h +include/glib-2.0/glib/ghook.h +include/glib-2.0/glib/giochannel.h +include/glib-2.0/glib/glist.h +include/glib-2.0/glib/gmacros.h +include/glib-2.0/glib/gmain.h +include/glib-2.0/glib/gmarkup.h +include/glib-2.0/glib/gmem.h +include/glib-2.0/glib/gmessages.h +include/glib-2.0/glib/gnode.h +include/glib-2.0/glib/gpattern.h +include/glib-2.0/glib/gprimes.h +include/glib-2.0/glib/gqsort.h +include/glib-2.0/glib/gquark.h +include/glib-2.0/glib/gqueue.h +include/glib-2.0/glib/grand.h +include/glib-2.0/glib/grel.h +include/glib-2.0/glib/gscanner.h +include/glib-2.0/glib/gshell.h +include/glib-2.0/glib/gslist.h +include/glib-2.0/glib/gspawn.h +include/glib-2.0/glib/gstrfuncs.h +include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gthread.h +include/glib-2.0/glib/gthreadpool.h +include/glib-2.0/glib/gtimer.h +include/glib-2.0/glib/gtree.h +include/glib-2.0/glib/gtypes.h +include/glib-2.0/glib/gunicode.h +include/glib-2.0/glib/gutils.h +include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h -include/glib-2.0/glist.h -include/glib-2.0/gmacros.h -include/glib-2.0/gmain.h -include/glib-2.0/gmarkup.h -include/glib-2.0/gmem.h -include/glib-2.0/gmessages.h include/glib-2.0/gmodule.h -include/glib-2.0/gnode.h include/glib-2.0/gobject/gboxed.h -include/glib-2.0/gobject/gbsearcharray.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h include/glib-2.0/gobject/gmarshal.h include/glib-2.0/gobject/gobject.h +include/glib-2.0/gobject/gobjectnotifyqueue.c include/glib-2.0/gobject/gparam.h include/glib-2.0/gobject/gparamspecs.h include/glib-2.0/gobject/gsignal.h +include/glib-2.0/gobject/gsourceclosure.h include/glib-2.0/gobject/gtype.h include/glib-2.0/gobject/gtypemodule.h include/glib-2.0/gobject/gtypeplugin.h @@ -43,44 +64,40 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -include/glib-2.0/gpattern.h -include/glib-2.0/gprimes.h -include/glib-2.0/gqsort.h -include/glib-2.0/gquark.h -include/glib-2.0/gqueue.h -include/glib-2.0/grand.h -include/glib-2.0/grel.h -include/glib-2.0/gscanner.h -include/glib-2.0/gshell.h -include/glib-2.0/gslist.h -include/glib-2.0/gspawn.h -include/glib-2.0/gstrfuncs.h -include/glib-2.0/gstring.h -include/glib-2.0/gthread.h -include/glib-2.0/gthreadpool.h -include/glib-2.0/gtimer.h -include/glib-2.0/gtree.h -include/glib-2.0/gtypes.h -include/glib-2.0/gunicode.h -include/glib-2.0/gutils.h -include/glib-2.0/gwin32.h lib/libglib-1.3.a lib/libglib-1.3.so -lib/libglib-1.3.so.6 +lib/libglib-1.3.so.9 lib/libgmodule-1.3.a lib/libgmodule-1.3.so -lib/libgmodule-1.3.so.6 +lib/libgmodule-1.3.so.9 lib/libgobject-1.3.a lib/libgobject-1.3.so -lib/libgobject-1.3.so.6 +lib/libgobject-1.3.so.9 lib/libgthread-1.3.a lib/libgthread-1.3.so -lib/libgthread-1.3.so.6 +lib/libgthread-1.3.so.9 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 +share/locale/az/LC_MESSAGES/glib20.mo +share/locale/ca/LC_MESSAGES/glib20.mo +share/locale/de/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 +share/locale/nn/LC_MESSAGES/glib20.mo +share/locale/no/LC_MESSAGES/glib20.mo +share/locale/ru/LC_MESSAGES/glib20.mo +share/locale/sk/LC_MESSAGES/glib20.mo +share/locale/sl/LC_MESSAGES/glib20.mo +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/zh_TW/LC_MESSAGES/glib20.mo @dirrm include/glib-2.0/gobject +@dirrm include/glib-2.0/glib @dirrm include/glib-2.0 |