- Update to 20050502

PR:		ports/80606
Submitted by:	KANOU Hiroki <kanou@khdd.net> (maintainer)

4 files changed, 42 insertions, 12 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 318509578d8b..76df9efa7ec7 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20050310
-PORTREVISION=	0
+PORTVERSION=	20050502
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
@@ -25,7 +24,8 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-DOCFILE=	${PORTNAME}_htdocs-${PORTVERSION}.tgz
+DOC_VERSION=	20050503
+DOCFILE=	${PORTNAME}_htdocs-${DOC_VERSION}.tgz
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 18a0b0dd7c2b..975a46f87060 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (fontforge_full-20050310.tgz) = 55787a2c60fd84599d316e0311bcb3ae
-SIZE (fontforge_full-20050310.tgz) = 4476929
-MD5 (fontforge_htdocs-20050310.tgz) = 10e27dbf02be98bddeb3098371e763e1
-SIZE (fontforge_htdocs-20050310.tgz) = 2108741
+MD5 (fontforge_full-20050502.tgz) = 6a19fe0e0e6c1d70c49014b1f967b481
+SIZE (fontforge_full-20050502.tgz) = 4149453
+MD5 (fontforge_htdocs-20050503.tgz) = 1f8de0694c7955ee8de268e70ab70e37
+SIZE (fontforge_htdocs-20050503.tgz) = 2153095
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index bc44984a2aa2..be8191cb697b 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,6 +1,6 @@
---- Makefile.dynamic.in.orig	Tue Dec 28 05:04:28 2004
-+++ Makefile.dynamic.in	Fri Mar 18 12:01:37 2005
-@@ -47,25 +47,26 @@
+--- Makefile.dynamic.in.orig	Wed Apr 20 01:36:16 2005
++++ Makefile.dynamic.in	Wed May  4 15:06:07 2005
+@@ -48,34 +48,35 @@
  	$(LIBTOOL) $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
  	#cp .libs/*.so.*.* $(libdir)
  	$(LIBTOOL) --finish $(libdir)
@@ -9,6 +9,18 @@
 +	mkdir -p ${PREFIX}/libdata/pkgconfig
 +	${BSD_INSTALL_DATA} -c fontforge.pc ${PREFIX}/libdata/pkgconfig
  
+ install_docs:
+ 	mkdir -p $(docdir)
+ 	mkdir $(docdir)/flags
+ #explicit use of sh to make sure we don't invoke csh with different "if" syntax
+ 	-sh -c "if test -d htdocs/ja >/dev/null ; then mkdir -p $(docdir)/ja ; fi"
+-	-cp htdocs/*.{html,png,gif,pdf} $(docdir)
+-	-cp htdocs/flags/* $(docdir)/flags
+-	-cp htdocs/ja/* $(docdir)/ja
++	${BSD_INSTALL_DATA} htdocs/*.{html,png,gif,pdf} $(docdir)
++	${BSD_INSTALL_DATA} htdocs/flags/* $(docdir)/flags
++	${BSD_INSTALL_DATA} htdocs/ja/* $(docdir)/ja
+ 
  install: $(sharedir) all install_libs
  # You may need to be root to do the install
  	mkdir -p $(bindir)
@@ -32,6 +44,6 @@
 +	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
 +	${BSD_INSTALL_MAN} $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
 +	${BSD_INSTALL_MAN} $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
+ #explicit use of sh to make sure we don't invoke csh with different "if" syntax
+ 	sh -c "if test -d htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
  
- uninstall:
- 	-rm $(bindir)/fontforge
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 6289d39346f1..be65370134b9 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -111,11 +111,13 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/TTRegisters.png
 %%PORTDOCS%%%%DOCSDIR%%/TTStack.png
 %%PORTDOCS%%%%DOCSDIR%%/TTStorage.png
+%%PORTDOCS%%%%DOCSDIR%%/TTgloss.png
 %%PORTDOCS%%%%DOCSDIR%%/TilePath.png
 %%PORTDOCS%%%%DOCSDIR%%/To-kerned.png
 %%PORTDOCS%%%%DOCSDIR%%/To-unkerned.png
 %%PORTDOCS%%%%DOCSDIR%%/Tricolor.png
 %%PORTDOCS%%%%DOCSDIR%%/TrueOpenTables.html
+%%PORTDOCS%%%%DOCSDIR%%/UniqueID.html
 %%PORTDOCS%%%%DOCSDIR%%/VerticalMetrics.png
 %%PORTDOCS%%%%DOCSDIR%%/a_dieresis_macron.png
 %%PORTDOCS%%%%DOCSDIR%%/a_with_anchor.png
@@ -130,11 +132,16 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/anchorcontrol-base.png
 %%PORTDOCS%%%%DOCSDIR%%/anchorcontrol-mark.png
 %%PORTDOCS%%%%DOCSDIR%%/anchorcontrol.html
+%%PORTDOCS%%%%DOCSDIR%%/asm1.png
+%%PORTDOCS%%%%DOCSDIR%%/asm2.png
+%%PORTDOCS%%%%DOCSDIR%%/asm3.png
+%%PORTDOCS%%%%DOCSDIR%%/asm4.png
 %%PORTDOCS%%%%DOCSDIR%%/autokern.png
 %%PORTDOCS%%%%DOCSDIR%%/autotrace.html
 %%PORTDOCS%%%%DOCSDIR%%/autowidth.html
 %%PORTDOCS%%%%DOCSDIR%%/autowidth.png
 %%PORTDOCS%%%%DOCSDIR%%/autowidthmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/bed-script.png
 %%PORTDOCS%%%%DOCSDIR%%/bezier.gif
 %%PORTDOCS%%%%DOCSDIR%%/bezier.html
 %%PORTDOCS%%%%DOCSDIR%%/bibliography.html
@@ -209,6 +216,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/editexample4.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample5.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample6.html
+%%PORTDOCS%%%%DOCSDIR%%/editexample6-5.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample7.html
 %%PORTDOCS%%%%DOCSDIR%%/editexample-fr.html
 %%PORTDOCS%%%%DOCSDIR%%/editmenu.html
@@ -233,6 +241,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/faqFrame.html
 %%PORTDOCS%%%%DOCSDIR%%/featsetdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-pos.png
+%%PORTDOCS%%%%DOCSDIR%%/feature-tag-pair.png
 %%PORTDOCS%%%%DOCSDIR%%/feature-tag-sub.png
 %%PORTDOCS%%%%DOCSDIR%%/ffanvil16.png
 %%PORTDOCS%%%%DOCSDIR%%/ffanvil32.png
@@ -258,6 +267,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-encoding.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-macfeat.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-macstyle.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-markclasses.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-panose.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-private.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ps.png
@@ -340,6 +350,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/mad.html
 %%PORTDOCS%%%%DOCSDIR%%/mergepost.png
 %%PORTDOCS%%%%DOCSDIR%%/mergepre.png
+%%PORTDOCS%%%%DOCSDIR%%/markclass.png
 %%PORTDOCS%%%%DOCSDIR%%/metricsmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/metricsview.html
 %%PORTDOCS%%%%DOCSDIR%%/mmappleaxes.png
@@ -369,6 +380,12 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/o5.png
 %%PORTDOCS%%%%DOCSDIR%%/oldchangelog.html
 %%PORTDOCS%%%%DOCSDIR%%/otherlinks.html
+%%PORTDOCS%%%%DOCSDIR%%/ott1.png
+%%PORTDOCS%%%%DOCSDIR%%/ott2.png
+%%PORTDOCS%%%%DOCSDIR%%/ott2_5.png
+%%PORTDOCS%%%%DOCSDIR%%/ott3.png
+%%PORTDOCS%%%%DOCSDIR%%/ott4.png
+%%PORTDOCS%%%%DOCSDIR%%/ott5.png
 %%PORTDOCS%%%%DOCSDIR%%/outlinechar.png
 %%PORTDOCS%%%%DOCSDIR%%/overlappedlines.png
 %%PORTDOCS%%%%DOCSDIR%%/overshoot.png
@@ -430,6 +447,7 @@ libdata/pkgconfig/fontforge.pc
 %%PORTDOCS%%%%DOCSDIR%%/sidebearings.png
 %%PORTDOCS%%%%DOCSDIR%%/showatt.html
 %%PORTDOCS%%%%DOCSDIR%%/showatt.png
+%%PORTDOCS%%%%DOCSDIR%%/sm-picture.png
 %%PORTDOCS%%%%DOCSDIR%%/splash.png
 %%PORTDOCS%%%%DOCSDIR%%/splinefont.html
 %%PORTDOCS%%%%DOCSDIR%%/splines.gif