Attachment 12196 Details for Bug 23716 – file.diff

[patch] file.diff

file.diff (text/plain), 7.13 KB, created by ishmael27 on 2000-12-21 17:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ishmael27

Created: 2000-12-21 17:50:01 UTC

Size: 7.13 KB

patch

obsolete

>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 <bsd.port.pre.mk>
> pre-patch:
> 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
> 		's|\$$$datadir$/gnome/|\$$$datadir$/|g ; \
> 		 s|\$$$datadir$/aclocal|\$$$prefix$/share/aclocal|g'
>-
>-.include <bsd.port.mk>
>+.if !defined(HAVE_GNOME)
>+	@${RM} -f ${WRKSRC}/doc/html/gnomecanvaspixbuf.html
>+.endif
>+	
>+.include <bsd.port.post.mk>
>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

Actions: View | Diff

Attachments on bug 23716: 12196