Attachment #21918 for bug #38229

View | Details | Raw Unified | Return to bug 38229
Collapse All | Expand All





PORTNAME=	libwmf
PORTVERSION=	0.2.5
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	wvware

MAINTAINER=	ports@FreeBSD.org

BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
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=	--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--enable-magick --with-sys-gd=no \
		--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' \




--- ltmain.sh.orig	Wed May 15 18:57:35 2002
+++ ltmain.sh	Fri May 17 21:18:44 2002
@@ -4731,10 +4731,12 @@
 	  *-*-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 @@
 	fi
 
 	# Install the pseudo-library for information purposes.




--- 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;

Lines 34-39 Link Here

(-)graphics/libwmf/pkg-plist (+3 lines)
34	lib/libwmf.a	34	lib/libwmf.a
35	lib/libwmf.so	35	lib/libwmf.so
36	lib/libwmf.so.2	36	lib/libwmf.so.2
		37	lib/libwmflite.a
		38	lib/libwmflite.so
		39	lib/libwmflite.so.2
37	%%PORTDOCS%%share/doc/libwmf/caolan/2.html	40	%%PORTDOCS%%share/doc/libwmf/caolan/2.html
38	%%PORTDOCS%%share/doc/libwmf/caolan/Arc.html	41	%%PORTDOCS%%share/doc/libwmf/caolan/Arc.html
39	%%PORTDOCS%%share/doc/libwmf/caolan/BitBlt.html	42	%%PORTDOCS%%share/doc/libwmf/caolan/BitBlt.html

Return to bug 38229

Lines 7-12 Link Here

(-)graphics/libwmf/Makefile (-13 / +14 lines)
7		7
8	PORTNAME= libwmf	8	PORTNAME= libwmf
9	PORTVERSION= 0.2.5	9	PORTVERSION= 0.2.5
		10	PORTREVISION= 1
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= wvware	13	MASTER_SITE_SUBDIR= wvware
Lines 14-39 Link Here
14	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
15		16
16	BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX	17	BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
17	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \	18	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
18	png:${PORTSDIR}/graphics/png \	19	png.5:${PORTSDIR}/graphics/png \
19	freetype.9:${PORTSDIR}/print/freetype2 \	20	freetype.9:${PORTSDIR}/print/freetype2 \
20	xml2.5:${PORTSDIR}/textproc/libxml2	21	xml2.5:${PORTSDIR}/textproc/libxml2
21		22
22	.ifndef (WITHOUT_X11)
23	USE_XLIB= yes
24	PLIST_SUB+= X11=''
25	.else
26	PKGNAMESUFFIX= -nox11
27	PLIST_SUB+= X11='@comment '
28	.endif
29
30	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
31	CONFIGURE_TARGET= # none	24	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
32	CONFIGURE_ARGS= --build=${ARCH}-portbld-freebsd${OSREL} \	25	CONFIGURE_ARGS= --enable-magick --with-sys-gd=no \
33	--enable-magick --with-sys-gd=no \
34	--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \	26	--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
35	--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts	27	--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
36	INSTALLS_SHLIB= yes	28	INSTALLS_SHLIB= yes
		29
		30	.if defined(WITHOUT_X11)
		31	PKGNAMESUFFIX= -nox11
		32	CONFIGURE_ARGS+= --with-x=no
		33	PLIST_SUB+= X11='@comment '
		34	.else
		35	USE_XLIB= yes
		36	PLIST_SUB+= X11=''
		37	.endif
37		38
38	pre-patch:	39	pre-patch:
39	@${PERL} -pi -e 's\|src include fonts doc\|src include fonts\|g' \	40	@${PERL} -pi -e 's\|src include fonts doc\|src include fonts\|g' \

Lines 1-16 Link Here

(-)graphics/libwmf/files/patch-ltmain.sh (-13 / +3 lines)
1	--- ltmain.sh.orig Sun Oct 28 22:08:24 2001	1	--- ltmain.sh.orig Wed May 15 18:57:35 2002
2	+++ ltmain.sh Sat Nov 17 05:11:40 2001	2	+++ ltmain.sh Fri May 17 21:18:44 2002
3	@@ -2408,6 +2408,9 @@	3	@@ -4731,10 +4731,12 @@
4	--netbsd*)
5	# Don't link with libc until the a.out ld.so is fixed.
6	;;
7	+ --freebsd*)
8	+ # FreeBSD doesn't need this...
9	+ ;;
10	*)
11	# Add libc to deplibs on all other systems if necessary.
12	if test $build_libtool_need_lc = "yes"; then
13	@@ -4175,10 +4178,12 @@
14	fi	4	fi
15		5
16	# Install the pseudo-library for information purposes.	6	# Install the pseudo-library for information purposes.

Line 0 Link Here

(-)graphics/libwmf/files/patch-src::font.c (+13 lines)
	1	--- src/font.c.orig Wed May 15 18:34:08 2002
	2	+++ src/font.c Fri May 17 23:56:23 2002
	3	@@ -833,8 +833,8 @@
	4
	5	#ifdef HAVE_XML2
	6
	7	-#include <libxml/parser.h>
	8	-#include <libxml/parserInternals.h>
	9	+#include <libxml2/libxml/parser.h>
	10	+#include <libxml2/libxml/parserInternals.h>
	11
	12	static void xml2_start (void* user_data,const char* tag,const char** attributes)
	13	{ const char** attr;