5 files changed, 17 insertions, 33 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 7189a885aa6d..dd9439378ce1 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.1.20
+PORTVERSION=	0.1.21
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -20,14 +20,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XLIB=	yes
 USE_XPM=	yes
 USE_FREETYPE=	yes
-INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype \
-		          -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+INSTALLS_SHLIB=	yes
 
 pre-configure:
-	(cd ${WRKSRC}; ${LN} -s xgd-1.7.3 xgd)
-	(cd ${WRKSRC}/libdib; ${LN} -s ../bytelevel.c)
+	(cd ${WRKSRC}; ${LN} -sf xgd-1.7.3 xgd)
+	(cd ${WRKSRC}/libdib; ${LN} -sf ../bytelevel.c)
 
 .include <bsd.port.mk>
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index a5c8a765081d..4dce8da8aac2 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.1.20.tar.gz) = 5f1b9cce9cce6ce60e061722a73eea79
+MD5 (libwmf-0.1.21.tar.gz) = d9db1ec2a1264245e7808d42bc686b97
diff --git a/graphics/libwmf/files/patch-aa b/graphics/libwmf/files/patch-aa
index 520a9e2cfdef..ca6b56080ed9 100644
--- a/graphics/libwmf/files/patch-aa
+++ b/graphics/libwmf/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Oct 11 04:16:15 2000
-+++ Makefile.in	Sat Nov  4 19:52:07 2000
+--- Makefile.in.orig	Tue Nov 14 19:32:08 2000
++++ Makefile.in	Mon Dec 18 22:28:07 2000
 @@ -19,6 +19,7 @@
  SHELL=/bin/sh
  
@@ -8,14 +8,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  INCLUDEDIR = @includedir@
-@@ -30,13 +31,13 @@
- libdir = @libdir@
- mandir = @mandir@
- 
--CFLAGS = @CFLAGS@ @DEFS@ -I. @XPM_CFLAGS@ -I./libxfig -I./libdib -I./xgd-1.7.3 @TTF_CFLAGS@
-+CFLAGS = @CFLAGS@ @DEFS@ -I. @XPM_CFLAGS@ -I./libxfig -I./libdib -I./xgd-1.7.3 @TTF_CFLAGS@ @CPPFLAGS@
- 
- MKINSTALLDIRS = $(srcdir)/mkinstalldirs
+@@ -36,7 +37,7 @@
  
  SHELL = /bin/sh
  
diff --git a/graphics/libwmf/files/patch-ab b/graphics/libwmf/files/patch-ab
index 375fea421eec..a4f5f79dbb32 100644
--- a/graphics/libwmf/files/patch-ab
+++ b/graphics/libwmf/files/patch-ab
@@ -1,19 +1,11 @@
---- xgd-1.7.3/Makefile.in.orig	Wed Oct 11 04:16:16 2000
-+++ xgd-1.7.3/Makefile.in	Sat Nov  4 20:01:31 2000
-@@ -29,14 +29,14 @@
- 
- #If you don't have FreeType and/or Xpm installed, including the
- #header files, uncomment this (default).
--CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
-+CFLAGS=@CFLAGS@ @DEFS@ -I../ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ @CPPFLAGS@
- #If you do have FreeType and/or Xpm fully installed, uncomment a
- #variation of this and comment out the line above. See also LIBS below.
- #CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF
+--- xgd-1.7.3/Makefile.in.orig	Tue Nov 14 19:32:11 2000
++++ xgd-1.7.3/Makefile.in	Mon Dec 18 22:29:49 2000
+@@ -36,7 +36,7 @@
  
  #If you don't have FreeType and/or Xpm fully installed, uncomment this
  #(default).
 -LIBS= -lxgd @PNG_LIBS@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
-+LIBS= -lxgd @PNG_LIBS@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ @LIBS@ -lm
++LIBS=@LIBS@ -lxgd @PNG_LIBS@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
  
  #If you do have FreeType and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
diff --git a/graphics/libwmf/files/patch-ad b/graphics/libwmf/files/patch-ad
index 554dbd5899c6..bb81e1a3c6f2 100644
--- a/graphics/libwmf/files/patch-ad
+++ b/graphics/libwmf/files/patch-ad
@@ -1,11 +1,11 @@
---- libdib/Makefile.in.orig	Fri Sep 22 04:14:36 2000
-+++ libdib/Makefile.in	Sat Nov  4 20:27:35 2000
+--- libdib/Makefile.in.orig	Tue Nov 14 19:32:10 2000
++++ libdib/Makefile.in	Mon Dec 18 22:33:23 2000
 @@ -22,30 +22,34 @@
  libdir = @libdir@
  mandir = @mandir@
  
--CFLAGS = @CFLAGS@ @DEFS@ -I.
-+CFLAGS = @CFLAGS@ @DEFS@ -I. -I..
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I.
++CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I. -I..
  
  MKINSTALLDIRS = $(srcdir)/mkinstalldirs