From owner-freebsd-ports Thu Dec 21 9:50:22 2000 From owner-freebsd-ports@FreeBSD.ORG Thu Dec 21 09:50:15 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CEDC637B404 for ; Thu, 21 Dec 2000 09:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBLHo1R85511; Thu, 21 Dec 2000 09:50:01 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 21 Dec 2000 09:50:01 -0800 (PST) Resent-Message-Id: <200012211750.eBLHo1R85511@freefall.freebsd.org> Resent-From: gnats-admin@FreeBSD.org (GNATS Management) Resent-To: freebsd-ports@FreeBSD.org Resent-Reply-To: gnats-admin@FreeBSD.org, ishmael27@home.com Received: from babylon.merseine.nu (c418236-a.clmba1.mo.home.com [24.12.203.134]) by hub.freebsd.org (Postfix) with ESMTP id 4DD4C37B400 for ; Thu, 21 Dec 2000 09:44:48 -0800 (PST) Received: (from ishmael@localhost) by babylon.merseine.nu (8.11.1/8.11.1) id eBLHk0A12086; Thu, 21 Dec 2000 11:46:00 -0600 (CST) (envelope-from ishmael) Message-Id: <200012211746.eBLHk0A12086@babylon.merseine.nu> Date: Thu, 21 Dec 2000 11:46:00 -0600 (CST) From: ishmael27@home.com Sender: ishmael@babylon.merseine.nu Reply-To: ishmael27@home.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/23716: Patch to make graphics/gdk-pixbuf optionally dependant upon GNOME Resent-Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23716 >Category: ports >Synopsis: Patch to make graphics/gdk-pixbuf optionally dependant upon GNOME >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 21 09:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Jeremy Norris >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: FreeBSD babylon.merseine.nu 4.2-STABLE FreeBSD 4.2-STABLE #0: Fri Dec 15 07:53:17 CST 2000 ishmael@babylon.merseine.nu:/usr/src/sys/compile/BABYLON i386 >Description: This patch allows gdk-pixbuf to be optionally dependant upon GNOME. It does NOT change any source code in this distribution, it only fiddles with configure script options, and changes one Makefile.in (to prevent installation of GNOME specific documentation). >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/gdk-pixbuf/Makefile ./Makefile --- /usr/ports/graphics/gdk-pixbuf/Makefile Thu Oct 5 02:10:45 2000 +++ ./Makefile Thu Dec 21 11:39:21 2000 @@ -7,6 +7,7 @@ PORTNAME= gdk-pixbuf PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf @@ -15,15 +16,20 @@ USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOMELIBS= yes +USE_GTK= yes +WANT_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +.include pre-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g' - -.include +.if !defined(HAVE_GNOME) + @${RM} -f ${WRKSRC}/doc/html/gnomecanvaspixbuf.html +.endif + +.include diff -urN /usr/ports/graphics/gdk-pixbuf/files/patch-ab ./files/patch-ab --- /usr/ports/graphics/gdk-pixbuf/files/patch-ab Mon Aug 28 13:10:38 2000 +++ ./files/patch-ab Thu Dec 21 11:39:21 2000 @@ -1,7 +1,15 @@ ---- Makefile.in.orig Sun Aug 27 18:48:23 2000 -+++ Makefile.in Mon Aug 28 10:14:58 2000 -@@ -109,3 +109,3 @@ +--- Makefile.in.orig Sat Dec 16 15:36:44 2000 ++++ Makefile.in Sat Dec 16 16:26:37 2000 +@@ -107,8 +107,10 @@ + + bin_SCRIPTS = gdk-pixbuf-config -confexecdir = $(libdir) +-confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh gnomecanvaspixbufConf.sh ++@BUILD_CANVAS_ITEM_TRUE@CANVAS_PIXBUF_CONF = gnomecanvaspisbufConf.sh ++@BUILD_CANVAS_ITEM_FALSE@CANVAS_PIXBUF_CONF = +confexecdir = $(sysconfdir) - confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh gnomecanvaspixbufConf.sh ++confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh $(CANVAS_PIXBUF_CONF) + + + EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gnomecanvaspixbufConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in diff -urN /usr/ports/graphics/gdk-pixbuf/pkg-plist ./pkg-plist --- /usr/ports/graphics/gdk-pixbuf/pkg-plist Mon Aug 28 13:10:39 2000 +++ ./pkg-plist Thu Dec 21 11:39:21 2000 @@ -1,13 +1,13 @@ bin/gdk-pixbuf-config etc/gdk_pixbufConf.sh etc/gdk_pixbuf_xlibConf.sh -etc/gnomecanvaspixbufConf.sh +%%GNOME:%%etc/gnomecanvaspixbufConf.sh include/gdk-pixbuf/gdk-pixbuf-features.h include/gdk-pixbuf/gdk-pixbuf-loader.h include/gdk-pixbuf/gdk-pixbuf-xlib.h include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h include/gdk-pixbuf/gdk-pixbuf.h -include/gdk-pixbuf/gnome-canvas-pixbuf.h +%%GNOME:%%include/gdk-pixbuf/gnome-canvas-pixbuf.h lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so lib/gdk-pixbuf/loaders/libpixbufloader-gif.so lib/gdk-pixbuf/loaders/libpixbufloader-ico.so @@ -23,54 +23,54 @@ lib/libgdk_pixbuf_xlib.a lib/libgdk_pixbuf_xlib.so lib/libgdk_pixbuf_xlib.so.2 -lib/libgnomecanvaspixbuf.a -lib/libgnomecanvaspixbuf.so -lib/libgnomecanvaspixbuf.so.1 +%%GNOME:%%lib/libgnomecanvaspixbuf.a +%%GNOME:%%lib/libgnomecanvaspixbuf.so +%%GNOME:%%lib/libgnomecanvaspixbuf.so.1 share/aclocal/gdk-pixbuf.m4 -share/gnome/html/gdk-pixbuf-decl.txt -share/gnome/html/gdk-pixbuf-sections.txt -share/gnome/html/gdk-pixbuf.hierarchy -share/gnome/html/gdk-pixbuf.html -share/gnome/html/gdk-pixbuf.types -share/gnome/html/gdk-pixbuf/a2605.html -share/gnome/html/gdk-pixbuf/a3640.html -share/gnome/html/gdk-pixbuf/a3652.html -share/gnome/html/gdk-pixbuf/a3694.html -share/gnome/html/gdk-pixbuf/a3716.html -share/gnome/html/gdk-pixbuf/book1.html -share/gnome/html/gdk-pixbuf/compiling.html -share/gnome/html/gdk-pixbuf/extra-configuration-options.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-animation.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-creating.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-file-loading.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-from-drawables.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-refcounting.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-rendering.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-scaling.html -share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html -share/gnome/html/gdk-pixbuf/gdkpixbufloader.html -share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html -share/gnome/html/gdk-pixbuf/index.html -share/gnome/html/gdk-pixbuf/license.html -share/gnome/html/gdk-pixbuf/r15.html -share/gnome/html/gdk-pixbuf/r27.html -share/gnome/html/gdk-pixbuf/x2624.html -share/gnome/html/gdk-pixbuf/x2676.html -share/gnome/html/gdk-pixbuf/x3659.html -share/gnome/html/gdk-pixbuf/x3671.html -share/gnome/html/gdk-pixbuf/x3711.html -share/gnome/html/gdk-pixbuf/x3713.html -share/gnome/html/gdk-pixbuf/x3723.html -share/gnome/html/gdk-pixbuf/x3735.html -share/gnome/html/gdk-pixbuf/x3765.html -share/gnome/html/gdk-pixbuf/x3787.html -@dirrm share/gnome/html/gdk-pixbuf -@dirrm share/gnome/html +%%DATADIR%%/html/gdk-pixbuf-decl.txt +%%DATADIR%%/html/gdk-pixbuf-sections.txt +%%DATADIR%%/html/gdk-pixbuf.hierarchy +%%DATADIR%%/html/gdk-pixbuf.html +%%DATADIR%%/html/gdk-pixbuf.types +%%DATADIR%%/html/gdk-pixbuf/a2605.html +%%DATADIR%%/html/gdk-pixbuf/a3640.html +%%DATADIR%%/html/gdk-pixbuf/a3652.html +%%DATADIR%%/html/gdk-pixbuf/a3694.html +%%DATADIR%%/html/gdk-pixbuf/a3716.html +%%DATADIR%%/html/gdk-pixbuf/book1.html +%%DATADIR%%/html/gdk-pixbuf/compiling.html +%%DATADIR%%/html/gdk-pixbuf/extra-configuration-options.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-animation.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-creating.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-file-loading.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-from-drawables.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-refcounting.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-rendering.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-scaling.html +%%DATADIR%%/html/gdk-pixbuf/gdk-pixbuf-util.html +%%DATADIR%%/html/gdk-pixbuf/gdkpixbufloader.html +%%GNOME:%%%%DATADIR%%/html/gdk-pixbuf/gnomecanvaspixbuf.html +%%DATADIR%%/html/gdk-pixbuf/index.html +%%DATADIR%%/html/gdk-pixbuf/license.html +%%DATADIR%%/html/gdk-pixbuf/r15.html +%%DATADIR%%/html/gdk-pixbuf/r27.html +%%DATADIR%%/html/gdk-pixbuf/x2624.html +%%DATADIR%%/html/gdk-pixbuf/x2676.html +%%DATADIR%%/html/gdk-pixbuf/x3659.html +%%DATADIR%%/html/gdk-pixbuf/x3671.html +%%DATADIR%%/html/gdk-pixbuf/x3711.html +%%DATADIR%%/html/gdk-pixbuf/x3713.html +%%DATADIR%%/html/gdk-pixbuf/x3723.html +%%DATADIR%%/html/gdk-pixbuf/x3735.html +%%DATADIR%%/html/gdk-pixbuf/x3765.html +%%DATADIR%%/html/gdk-pixbuf/x3787.html +@dirrm %%DATADIR%%/html/gdk-pixbuf +@dirrm %%DATADIR%%/html @dirrm include/gdk-pixbuf @dirrm lib/gdk-pixbuf/loaders @dirrm lib/gdk-pixbuf >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message