Upgrade to 0.1.20.

PR:		ports/22781
Submitted by:	mzaki@e-mail.ne.jp

8 files changed, 104 insertions, 57 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 24a1a6cda518..7189a885aa6d 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	libwmf
-PORTVERSION=	0.1.17
+PORTVERSION=	0.1.20
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/libwmf/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	wvware
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -23,9 +24,10 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype \
 		          -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}"/lib
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-configure:
-	(cd ${WRKSRC}; ln -s xgd-1.7.3 xgd)
+	(cd ${WRKSRC}; ${LN} -s xgd-1.7.3 xgd)
+	(cd ${WRKSRC}/libdib; ${LN} -s ../bytelevel.c)
 
 .include <bsd.port.mk>
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 58991d4e9d87..a5c8a765081d 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1 +1 @@
-MD5 (libwmf-0.1.17.tar.gz) = 7ade0bda9c9ba343481a0f272d302c7d
+MD5 (libwmf-0.1.20.tar.gz) = 5f1b9cce9cce6ce60e061722a73eea79
diff --git a/graphics/libwmf/files/patch-aa b/graphics/libwmf/files/patch-aa
index d3cfb9551ea2..520a9e2cfdef 100644
--- a/graphics/libwmf/files/patch-aa
+++ b/graphics/libwmf/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Dec 17 00:31:01 1999
-+++ Makefile.in	Tue May 30 19:21:49 2000
-@@ -17,6 +17,7 @@
+--- Makefile.in.orig	Wed Oct 11 04:16:15 2000
++++ Makefile.in	Sat Nov  4 19:52:07 2000
+@@ -19,6 +19,7 @@
  SHELL=/bin/sh
  
  INSTALL = @INSTALL@
@@ -8,7 +8,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  INCLUDEDIR = @includedir@
-@@ -28,13 +29,13 @@
+@@ -30,13 +31,13 @@
  libdir = @libdir@
  mandir = @mandir@
  
@@ -24,12 +24,12 @@
  
  WMFLIBOBJECTS =	\
  	wmfapi.o \
-@@ -53,35 +54,64 @@
+@@ -58,42 +59,77 @@
  	Xtext.o \
  	rotated.o
  
--TARGETS = wmftopng wmftofig xwmf
-+LIBRARIES=	\
+-TARGETS = wmftopng wmftofig wmftoeps xwmf
++LIBRARIES = 	\
 +	LIBXGD \
 +	LIBDIB \
 +	LIBXFIG \
@@ -37,12 +37,14 @@
 +	libgdwmf.a \
 +	libxfwmf.a \
 +	libXwmf.a \
++	libepswmf.a \
 +	libwmf.so.1 \
 +	libgdwmf.so.1 \
 +	libxfwmf.so.1 \
-+	libXwmf.so.1
++	libXwmf.so.1 \
++	libepswmf.so.1
 +
-+TARGETS = $(LIBRARIES) wmftopng wmftofig xwmf
++TARGETS = $(LIBRARIES) wmftopng wmftofig wmftoeps xwmf
  
  all: $(TARGETS)
  
@@ -58,43 +60,55 @@
 +wmftofig: libwmf.so.1 libxfwmf.so.1 wmftofig.o LIBXFIG
  	$(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS)
  
+-wmftoeps: libwmf.a libepswmf.a wmftoeps.o LIBXFIG
++wmftoeps: libwmf.so.1 libepswmf.so.1 wmftoeps.o LIBXFIG
+ 	$(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L. -lepswmf -lwmf $(EPSLIBS)
+ 
  libwmf.a:	$(WMFLIBOBJECTS)
  	 $(AR) rc libwmf.a $(WMFLIBOBJECTS) 
  	 $(RANLIB) libwmf.a 
  
-+libwmf.so.1: 	$(WMFLIBOBJECTS:.o=.so)
++libwmf.so.1:	$(WMFLIBOBJECTS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(WMFLIBOBJECTS:.o=.so) $(LIBS)
 +	ln -sf libwmf.so.1 libwmf.so
 +
  libgdwmf.a:	$(GDLIBOBJECTS)
  	 $(AR) rc libgdwmf.a $(GDLIBOBJECTS) 
  	 $(RANLIB) libgdwmf.a
- 
-+libgdwmf.so.1:	$(GDLIBOBJECTS:.o=.so)
++ 
++libgdwmf.so.1: $(GDLIBOBJECTS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(GDLIBOBJECTS:.o=.so) $(LIBS)
 +	ln -sf libgdwmf.so.1 libgdwmf.so
-+
+ 
  libxfwmf.a:	$(XFLIBOBJECTS)
  	 $(AR) rc libxfwmf.a $(XFLIBOBJECTS) 
  	 $(RANLIB) libxfwmf.a
- 
-+libxfwmf.so.1:	$(XFLIBOBJECTS:.o=.so)
++ 
++libxfwmf.so.1: $(XFLIBOBJECTS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(XFLIBOBJECTS:.o=.so) $(LIBS)
 +	ln -sf libxfwmf.so.1 libxfwmf.so
+ 
+ libepswmf.a:	$(EPSLIBOBJECTS)
+ 	 $(AR) rc libepswmf.a $(EPSLIBOBJECTS) 
+ 	 $(RANLIB) libepswmf.a
+ 
++libepswmf.so.1:	$(EPSLIBOBJECTS:.o=.so)
++	$(CC) -shared -Wl,-soname,$@ -o $@ $(EPSLIBOBJECTS:.o=.so) $(LIBS)
++	ln -sf libepswmf.so.1 libepswmf.so
 +
  libXwmf.a:	$(XLIBOBJECTS)
  	 $(AR) rc libXwmf.a $(XLIBOBJECTS) 
  	 $(RANLIB) libXwmf.a
  
-+libXwmf.so.1:	$(XLIBOBJECTS:.o=.so)
++libXwmf.so.1:  $(XLIBOBJECTS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(XLIBOBJECTS:.o=.so) $(LIBS)
 +	ln -sf libXwmf.so.1 libXwmf.so
 +
  LIBDIB:
  	@echo making libdib in libdib
  	@(cd libdib && $(MAKE)) || exit 1
-@@ -94,8 +124,8 @@
- 	@echo making libxfig in libxfig
+@@ -106,8 +142,8 @@
+ 	@echo making libxfig, libeps in libxfig
  	@(cd libxfig && $(MAKE)) || exit 1
  
 -%.o: %.c 
@@ -103,21 +117,24 @@
 +	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
  
  clean: cleansub
- 	rm -rf *.o wmftopng wmftofig xwmf a.out core *.a .pure
-@@ -134,15 +164,24 @@
+ 	rm -rf *.o wmftopng wmftofig wmftoeps xwmf a.out core *.a .pure
+@@ -146,17 +182,28 @@
  	$(libdir)
  
  install: all installdirs installsub
 -	$(INSTALL) $(srcdir)/xwmf $(bindir)/xwmf
 -	$(INSTALL) $(srcdir)/wmftopng $(bindir)/wmftopng
 -	$(INSTALL) $(srcdir)/wmftofig $(bindir)/wmftofig
+-	$(INSTALL) $(srcdir)/wmftoeps $(bindir)/wmftoeps
 +	$(INSTALL_PROGRAM) $(srcdir)/xwmf $(bindir)/xwmf
 +	$(INSTALL_PROGRAM) $(srcdir)/wmftopng $(bindir)/wmftopng
 +	$(INSTALL_PROGRAM) $(srcdir)/wmftofig $(bindir)/wmftofig
++	$(INSTALL_PROGRAM) $(srcdir)/wmftoeps $(bindir)/wmftoeps
  	$(INSTALL_DATA) $(srcdir)/libwmf.a $(libdir)/libwmf.a
  	$(INSTALL_DATA) $(srcdir)/libgdwmf.a $(libdir)/libgdwmf.a
  	$(INSTALL_DATA) $(srcdir)/libXwmf.a $(libdir)/libXwmf.a
  	$(INSTALL_DATA) $(srcdir)/libxfwmf.a $(libdir)/libxfwmf.a
+ 	$(INSTALL_DATA) $(srcdir)/libepswmf.a $(libdir)/libepswmf.a
 +	$(INSTALL_DATA) $(srcdir)/libwmf.so.1 $(libdir)/libwmf.so.1
 +	ln -sf libwmf.so.1 $(libdir)/libwmf.so
 +	$(INSTALL_DATA) $(srcdir)/libgdwmf.so.1 $(libdir)/libgdwmf.so.1
@@ -126,6 +143,8 @@
 +	ln -sf libXwmf.so.1 $(libdir)/libXwmf.so
 +	$(INSTALL_DATA) $(srcdir)/libxfwmf.so.1 $(libdir)/libxfwmf.so.1
 +	ln -sf libxfwmf.so.1 $(libdir)/libxfwmf.so
++	$(INSTALL_DATA) $(srcdir)/libepswmf.so.1 $(libdir)/libepswmf.so.1
++	ln -sf libepswmf.so.1 $(libdir)/libepswmf.so
  	$(INSTALL_DATA) wmfapi.h $(INCLUDEDIR)/wmfapi.h
  	$(INSTALL_DATA) gdwmfapi.h $(INCLUDEDIR)/gdwmfapi.h
  	$(INSTALL_DATA) Xwmfapi.h $(INCLUDEDIR)/Xwmfapi.h
diff --git a/graphics/libwmf/files/patch-ab b/graphics/libwmf/files/patch-ab
index 99df2f9596ba..375fea421eec 100644
--- a/graphics/libwmf/files/patch-ab
+++ b/graphics/libwmf/files/patch-ab
@@ -1,19 +1,19 @@
---- xgd-1.7.3/Makefile.in.orig	Fri Dec 17 00:31:47 1999
-+++ xgd-1.7.3/Makefile.in	Tue May 30 19:20:35 2000
+--- 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../ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@
-+CFLAGS=@CFLAGS@ @DEFS@ -I../ @ZLIB_CFLAGS@ @TTF_CFLAGS@ @XPM_CFLAGS@ @CPPFLAGS@
+-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
  
  #If you don't have FreeType and/or Xpm fully installed, uncomment this
  #(default).
--LIBS= -lxgd @LIB_PNG@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ -lm
-+LIBS= -lxgd @LIB_PNG@ @ZLIB_LIBS@ @TTF_LIBS@ @XPM_LIBS@ @X_LIBS@ @X11@ @X_EXTRA_LIBS@ @LIBS@ -lm
+-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
  
  #If you do have FreeType and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
@@ -56,7 +56,7 @@
  	$(INSTALL_DATA) gd.h $(INSTALL_INCLUDE)/gd.h
  	$(INSTALL_DATA) gdcache.h $(INSTALL_INCLUDE)/gdcache.h
  	$(INSTALL_DATA) gd_io.h $(INSTALL_INCLUDE)/gd_io.h
-@@ -134,16 +134,19 @@
+@@ -134,16 +134,20 @@
  gdtestttf: gdtestttf.o libxgd.a
  	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
  
@@ -75,11 +75,12 @@
 -		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
 -		gdtables.o gdttf.o gdcache.o gdkanji.o
 +	$(AR) rc libxgd.a $(OBJS)
- 	-ranlib libxgd.a
+ 	-@RANLIB@ libxgd.a
 +
 +libxgd.so.1:	$(INCS) $(OBJS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS)
 +	ln -sf libxgd.so.1 libxgd.so
++
  
  clean:
- 	rm -f *.o *.a ${PROGRAMS}
+ 	rm -f *.o *.a ${PROGRAMS} core 
diff --git a/graphics/libwmf/files/patch-ac b/graphics/libwmf/files/patch-ac
index c141a4b2b6dc..6eecd7840231 100644
--- a/graphics/libwmf/files/patch-ac
+++ b/graphics/libwmf/files/patch-ac
@@ -1,41 +1,53 @@
---- libxfig/Makefile.in.orig	Tue Jul 13 22:16:20 1999
-+++ libxfig/Makefile.in	Tue May 30 19:22:25 2000
-@@ -28,21 +28,25 @@
+--- libxfig/Makefile.in.orig	Wed Sep 27 06:00:22 2000
++++ libxfig/Makefile.in	Sat Nov  4 20:08:07 2000
+@@ -28,7 +28,7 @@
  
  SHELL = /bin/sh
  
 -.SUFFIXES: .C .o
 +.SUFFIXES: .c .o .so
  
- MYOBJECTS = \
+ XFOBJECTS = \
  	color.o \
- 	objlist.o \
- 	fileops.o
+@@ -41,18 +41,26 @@
+ 	epsfileops.o
  
--all: libxfig.a 
-+all: libxfig.a libxfig.so.1
  
- libxfig.a:  $(MYOBJECTS)
- 	$(AR) rc libxfig.a $(MYOBJECTS)
+-all: libxfig.a libeps.a
++all: libxfig.a libxfig.so.1 libeps.a libeps.so.1
+ 
+ libxfig.a:  $(XFOBJECTS)
+ 	$(AR) rc libxfig.a $(XFOBJECTS)
  	$(RANLIB) libxfig.a 
  
++libxfig.so.1:  $(XFOBJECTS:.o=.so)
++	$(CC) -shared -Wl,-soname,$@ -o $@ $(XFOBJECTS:.o=.so) $(LIBS)
++	ln -sf libxfig.so.1 libxfig.so
++
+ libeps.a:  $(EPSOBJECTS)
+ 	$(AR) rc libeps.a $(EPSOBJECTS)
+ 	$(RANLIB) libeps.a 
+ 
 -%.o: %.c
 -	$(CC) $(CFLAGS) -c $*.c
-+libxfig.so.1:  $(MYOBJECTS:.o=.so)
-+	$(CC) -shared -Wl,-soname,$@ -o $@ $(MYOBJECTS:.o=.so) $(LIBS)
-+	ln -sf libxfig.so.1 libxfig.so
++libeps.so.1:  $(EPSOBJECTS:.o=.so)
++	$(CC) -shared -Wl,-soname,$@ -o $@ $(EPSOBJECTS:.o=.so) $(LIBS)
++	ln -sf libeps.so.1 libeps.so
 +
 +.c.so:
 +	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
  
  clean:
  	rm -rf *.o *.a core
-@@ -52,6 +56,8 @@
+@@ -62,7 +70,11 @@
  
  install: all installdirs
  	$(INSTALL_DATA) libxfig.a @libdir@/libxfig.a
 +	$(INSTALL_DATA) libxfig.so.1 @libdir@/libxfig.so.1
 +	ln -sf libxfig.so.1 @libdir@/libxfig.so
+ 	$(INSTALL_DATA) libeps.a @libdir@/libeps.a
++	$(INSTALL_DATA) libeps.so.1 @libdir@/libeps.so.1
++	ln -sf libeps.so.1 @libdir@/libeps.so
  
  installdirs:
  	$(MKINSTALLDIRS) @libdir@ \
diff --git a/graphics/libwmf/files/patch-ad b/graphics/libwmf/files/patch-ad
index 318de818f496..554dbd5899c6 100644
--- a/graphics/libwmf/files/patch-ad
+++ b/graphics/libwmf/files/patch-ad
@@ -1,6 +1,13 @@
---- libdib/Makefile.in.orig	Tue Jul 13 22:14:28 1999
-+++ libdib/Makefile.in	Tue May 30 19:22:58 2000
-@@ -28,25 +28,29 @@
+--- libdib/Makefile.in.orig	Fri Sep 22 04:14:36 2000
++++ libdib/Makefile.in	Sat Nov  4 20:27:35 2000
+@@ -22,30 +22,34 @@
+ libdir = @libdir@
+ mandir = @mandir@
+ 
+-CFLAGS = @CFLAGS@ @DEFS@ -I.
++CFLAGS = @CFLAGS@ @DEFS@ -I. -I..
+ 
+ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
  
  SHELL = /bin/sh
  
@@ -8,7 +15,8 @@
 +.SUFFIXES: .c .o .so
  
  MYOBJECTS = \
-     bytelevel.o \
+-    ../bytelevel.o \
++    bytelevel.o \
      bintree.o \
      dibtoxpm.o
  
@@ -19,7 +27,7 @@
  	$(AR) rc libdib.a $(MYOBJECTS)
  	$(RANLIB) libdib.a 
  
-+libdib.so.1:  $(MYOBJECTS:.o=.so)
++libdib.so.1:	$(MYOBJECTS:.o=.so)
 +	$(CC) -shared -Wl,-soname,$@ -o $@ $(MYOBJECTS:.o=.so) $(LIBS)
 +	ln -sf libdib.so.1 libdib.so
 +
@@ -28,13 +36,11 @@
  
 -%.o: %.c
 -	$(CC) $(CFLAGS) -c $*.c
--
 +.c.so:
 +	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
-+       
+ 
  clean:
  	rm -rf *.o *.a test_dibtoxpm a.out core
- 
 @@ -60,6 +64,8 @@
  install: all installdirs
  	$(INSTALL_DATA) dibtoxpm.h $(INCLUDEDIR)/dibtoxpm.h
diff --git a/graphics/libwmf/pkg-descr b/graphics/libwmf/pkg-descr
index 553e3687aecf..e7b1cea01a5a 100644
--- a/graphics/libwmf/pkg-descr
+++ b/graphics/libwmf/pkg-descr
@@ -3,4 +3,4 @@ files into other formats, currently it supports a gd binding
 to convert to png, and an X one to draw direct to an X window
 or pixmap.
 
-WWW: http://www.csn.ul.ie/~caolan/docs/libwmf.html
+WWW: http://www.wvware.com/libwmf.html
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index d81a86eb3c45..5d27bb986eb2 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -1,3 +1,4 @@
+bin/wmftoeps
 bin/wmftofig
 bin/wmftopng
 bin/xwmf
@@ -20,6 +21,12 @@ lib/libXwmf.so.1
 lib/libdib.a
 lib/libdib.so
 lib/libdib.so.1
+lib/libeps.a
+lib/libeps.so
+lib/libeps.so.1
+lib/libepswmf.a
+lib/libepswmf.so
+lib/libepswmf.so.1
 lib/libgdwmf.a
 lib/libgdwmf.so
 lib/libgdwmf.so.1