diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-27 05:18:14 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-27 05:18:14 +0800 |
commit | 56c738fa7bd1609a1294981fa5b6e275726ac97e (patch) | |
tree | 2cf63e75cdb0ae6a1670486330612f1c887ae3b9 | |
parent | 63b3455d587b12e4a84258820d1a839c3a2e84c7 (diff) | |
download | marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.gz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.bz2 marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.lz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.xz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.zst marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.zip |
Fix gir installation, by tweaking the sed lines in patch-configure.
Thanks to Joe. For the fix and the tweak. (Forgot to credit him last commit).
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13308 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | x11-toolkits/gtk20/Makefile | 11 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-configure | 12 | ||||
-rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 5 |
3 files changed, 17 insertions, 11 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index fcdc46cef..a95660aa2 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.176 2009/12/08 19:16:21 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.177 2009/12/26 11:00:11 kwm Exp $ # PORTNAME= gtk PORTVERSION= 2.19.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -29,12 +29,14 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.10:${PORTSDIR}/graphics/jpeg \ jasper.4:${PORTSDIR}/graphics/jasper RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango USE_GMAKE= yes USE_PERL5= yes @@ -44,8 +46,7 @@ USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper \ - --enable-introspection=no +CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure index d0585868d..d32cd0e73 100644 --- a/x11-toolkits/gtk20/files/patch-configure +++ b/x11-toolkits/gtk20/files/patch-configure @@ -1,14 +1,14 @@ ---- configure.orig 2009-12-25 21:13:23.000000000 +0100 -+++ configure 2009-12-25 21:15:59.000000000 +0100 +--- configure.orig 2009-12-26 21:41:27.000000000 +0100 ++++ configure 2009-12-26 21:51:04.000000000 +0100 @@ -33884,9 +33884,9 @@ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$datadir|\$(datadir)|"` ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$libdir|\$(libdir)|"` ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection @@ -17,10 +17,10 @@ # Hack around introspection installing into an absolute path breaking distcheck tmp=`pkg-config --variable=datadir gobject-introspection-1.0` -INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$tmp/\$(datadir)} -+INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$tmp|\$(datadir)|"` ++INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${tmp}|\\\$(datadir)|"` tmp=`pkg-config --variable=libdir gobject-introspection-1.0` -INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$tmp/\$(libdir)} -+INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$tmp|\$(libdir)|"` ++INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${tmp}|\\\$(libdir)|"` ################################################## # Checks for gtk-doc and docbook-tools diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 1a2018f18..0da37707f 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -276,6 +276,8 @@ include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h include/gtk-unix-print-2.0/gtk/gtkunixprint.h +lib/girepository-1.0/GdkPixbuf-2.0.typelib +lib/girepository-1.0/Gtk-2.0.typelib lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -407,6 +409,9 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-unix-print-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/gir-1.0/Gdk-2.0.gir +share/gir-1.0/GdkPixbuf-2.0.gir +share/gir-1.0/Gtk-2.0.gir share/gtk-2.0/demo/alphatest.png share/gtk-2.0/demo/apple-red.png share/gtk-2.0/demo/appwindow.c |