Attachment 21918 Details for Bug 38229 – file.diff

[patch] file.diff

file.diff (text/plain), 3.36 KB, created by tkato on 2002-05-18 09:00:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-05-18 09:00:11 UTC

Size: 3.36 KB

patch

obsolete

>diff -urN /usr/ports/graphics/libwmf/Makefile graphics/libwmf/Makefile
>--- /usr/ports/graphics/libwmf/Makefile	Sat May 18 16:47:57 2002
>+++ graphics/libwmf/Makefile	Sat May 18 16:50:41 2002
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	libwmf
> PORTVERSION=	0.2.5
>+PORTREVISION=	1
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	wvware
>@@ -14,26 +15,26 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
>-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
>-		png:${PORTSDIR}/graphics/png \
>+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
>+		png.5:${PORTSDIR}/graphics/png \
> 		freetype.9:${PORTSDIR}/print/freetype2 \
> 		xml2.5:${PORTSDIR}/textproc/libxml2
> 
>-.ifndef (WITHOUT_X11)
>-USE_XLIB=	yes
>-PLIST_SUB+=	X11=''
>-.else
>-PKGNAMESUFFIX=	-nox11
>-PLIST_SUB+=	X11='@comment '
>-.endif
>-
> GNU_CONFIGURE=	yes
>-CONFIGURE_TARGET=	# none
>-CONFIGURE_ARGS=	--build=${ARCH}-portbld-freebsd${OSREL} \
>-		--enable-magick --with-sys-gd=no \
>+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ARGS=	--enable-magick --with-sys-gd=no \
> 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
> 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
> INSTALLS_SHLIB=	yes
>+
>+.if defined(WITHOUT_X11)
>+PKGNAMESUFFIX=	-nox11
>+CONFIGURE_ARGS+=	--with-x=no
>+PLIST_SUB+=	X11='@comment '
>+.else
>+USE_XLIB=	yes
>+PLIST_SUB+=	X11=''
>+.endif
> 
> pre-patch:
> 	@${PERL} -pi -e 's|src include fonts doc|src include fonts|g' \
>diff -urN /usr/ports/graphics/libwmf/files/patch-ltmain.sh graphics/libwmf/files/patch-ltmain.sh
>--- /usr/ports/graphics/libwmf/files/patch-ltmain.sh	Tue Nov 20 12:54:56 2001
>+++ graphics/libwmf/files/patch-ltmain.sh	Fri May 17 21:18:56 2002
>@@ -1,16 +1,6 @@
>---- ltmain.sh.orig	Sun Oct 28 22:08:24 2001
>-+++ ltmain.sh	Sat Nov 17 05:11:40 2001
>-@@ -2408,6 +2408,9 @@
>- 	  *-*-netbsd*)
>- 	    # Don't link with libc until the a.out ld.so is fixed.
>- 	    ;;
>-+	  *-*-freebsd*)
>-+	    # FreeBSD doesn't need this...
>-+	    ;;
>- 	  *)
>- 	    # Add libc to deplibs on all other systems if necessary.
>- 	    if test $build_libtool_need_lc = "yes"; then
>-@@ -4175,10 +4178,12 @@
>+--- ltmain.sh.orig	Wed May 15 18:57:35 2002
>++++ ltmain.sh	Fri May 17 21:18:44 2002
>+@@ -4731,10 +4731,12 @@
>  	fi
>  
>  	# Install the pseudo-library for information purposes.
>diff -urN /usr/ports/graphics/libwmf/files/patch-src::font.c graphics/libwmf/files/patch-src::font.c
>--- /usr/ports/graphics/libwmf/files/patch-src::font.c	Thu Jan  1 09:00:00 1970
>+++ graphics/libwmf/files/patch-src::font.c	Fri May 17 23:56:35 2002
>@@ -0,0 +1,13 @@
>+--- src/font.c.orig	Wed May 15 18:34:08 2002
>++++ src/font.c	Fri May 17 23:56:23 2002
>+@@ -833,8 +833,8 @@
>+ 
>+ #ifdef HAVE_XML2
>+ 
>+-#include <libxml/parser.h>
>+-#include <libxml/parserInternals.h>
>++#include <libxml2/libxml/parser.h>
>++#include <libxml2/libxml/parserInternals.h>
>+ 
>+ static void xml2_start (void* user_data,const char* tag,const char** attributes)
>+ {	const char** attr;
>diff -urN /usr/ports/graphics/libwmf/pkg-plist graphics/libwmf/pkg-plist
>--- /usr/ports/graphics/libwmf/pkg-plist	Sat May 18 16:48:00 2002
>+++ graphics/libwmf/pkg-plist	Fri May 17 23:29:11 2002
>@@ -34,6 +34,9 @@
> lib/libwmf.a
> lib/libwmf.so
> lib/libwmf.so.2
>+lib/libwmflite.a
>+lib/libwmflite.so
>+lib/libwmflite.so.2
> %%PORTDOCS%%share/doc/libwmf/caolan/2.html
> %%PORTDOCS%%share/doc/libwmf/caolan/Arc.html
> %%PORTDOCS%%share/doc/libwmf/caolan/BitBlt.html

Actions: View | Diff

Attachments on bug 38229: 21918