- Update to 20060822

PR:		ports/102861
Submitted by:	Remy Oudompheng <remy.oudompheng@ens.fr>
Approved by:	KANOU Hiroki <kanou@khdd.net> (maintainer)

5 files changed, 41 insertions, 36 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index c169fb9dc6b6..8416e412c167 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20060413
+PORTVERSION=	20060822
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
@@ -28,7 +28,7 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-DOC_VERSION=	20060406
+DOC_VERSION=	20060822
 DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 .if !defined(NOPORTDOCS)
 DOCFILES+=	${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
@@ -57,7 +57,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
 		-I${LOCALBASE}/include/freetype2"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GCC=	3.2+
 
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 5c2cc53e2ea8..7d8bc7da4fd2 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,12 +1,12 @@
-MD5 (fontforge_full-20060413.tar.bz2) = 5058e33dbbd5c0ca344dc73c6ff7a428
-SHA256 (fontforge_full-20060413.tar.bz2) = ce1c8a7299d001967b26f9fae002024a190ea5b5092d431dc924888db9adc721
-SIZE (fontforge_full-20060413.tar.bz2) = 3226436
+MD5 (fontforge_full-20060822.tar.bz2) = 872a8013be82e322677f7c254101544d
+SHA256 (fontforge_full-20060822.tar.bz2) = 579999b9804f9c689e5b61fd42f31c4944792d6c2772bc994c57dd4b779795b9
+SIZE (fontforge_full-20060822.tar.bz2) = 3421669
 MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
 SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
 SIZE (freetype-2.1.10.tar.bz2) = 1037107
-MD5 (fontforge_htdocs-20060406.tar.bz2) = 03ab55ad1298592e8e15137362dee99c
-SHA256 (fontforge_htdocs-20060406.tar.bz2) = 5f6fa6e86f683af91e5ffefc71a68a0daa8a7fb10ccd661afe1db53952f241b7
-SIZE (fontforge_htdocs-20060406.tar.bz2) = 2119657
-MD5 (fontforge_ja_htdocs-20060406.tar.bz2) = 56c3cabcb75dde840cb6ff251242da4e
-SHA256 (fontforge_ja_htdocs-20060406.tar.bz2) = 7712b116c746de2a741337c196da3aec15d4b95afcd74a81a246b650eb17d18a
-SIZE (fontforge_ja_htdocs-20060406.tar.bz2) = 2794098
+MD5 (fontforge_htdocs-20060822.tar.bz2) = 40f374cf43d57d8e8f29e7fe25bf8f39
+SHA256 (fontforge_htdocs-20060822.tar.bz2) = 1577470e18beda41b9fd628f0a9b3a2df789e81c9fea0515696dff3600a7f3ad
+SIZE (fontforge_htdocs-20060822.tar.bz2) = 2168927
+MD5 (fontforge_ja_htdocs-20060822.tar.bz2) = 4f672807a8885c67f98b6f449d6f101a
+SHA256 (fontforge_ja_htdocs-20060822.tar.bz2) = 7fab073647edd096aaff93c114f9a4385dc16dec0903c0a92735d531d4d4a49d
+SIZE (fontforge_ja_htdocs-20060822.tar.bz2) = 3200612
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 33621dea0a45..999ebc924ca0 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -5,25 +5,9 @@
  	#cp .libs/*.so.*.* $(libdir)
  	$(LIBTOOL) --mode=finish $(libdir)
 -	mkdir -p $(libdir)/pkgconfig
--	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc $(libdir)/pkgconfig
+-	$(INSTALL_DATA) fontforge.pc $(libdir)/pkgconfig
 +	mkdir -p ${PREFIX}/libdata/pkgconfig
-+	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge.pc ${PREFIX}/libdata/pkgconfig
++	$(INSTALL_DATA) fontforge.pc ${PREFIX}/libdata/pkgconfig
  
  install_docs:
  	mkdir -p $(docdir)
-@@ -76,6 +76,7 @@
- 	mkdir -p $(sharedir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/acorn2sfd $(bindir)
- #	-rm -f $(bindir)/pfaedit
- #	(cd $(bindir) ; ln -s fontforge pfaedit)
- #	$(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
-@@ -92,6 +93,7 @@
- uninstall:
- 	-rm $(bindir)/fontforge
- 	-rm $(bindir)/sfddiff
-+	-rm $(bindir)/acorn2sfd
- 	-rm $(sharedir)/pfaedit-*.ui
- 	-rm $(localedir)/*/LC_MESSAGES/FontForge.mo
- 	-rm $(mandir)/man1/fontforge.1
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index d146c1f0ce7b..5147c3b08cff 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -4,8 +4,7 @@
   cvdgloss.o groups.o parsepdf.o plugins.o bdfinfo.o \
   glyphcomp.o @FF_EXTRA_FILES@
  DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
--ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
-+ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o stamp.o namelist.o pua.o
+ ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
  
 -_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
 +_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
@@ -20,8 +19,7 @@
 +    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
 +DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
  
--all: fontforge sfddiff
-+all: fontforge sfddiff acorn2sfd
+ all: fontforge sfddiff
  
  fontforge: main.o $(fontforge_LIBOBJECTS)
  	$(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index e958df90b212..2cd228b0bcd0 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1,6 +1,5 @@
 bin/fontforge
 bin/sfddiff
-bin/acorn2sfd
 lib/libgdraw.la
 lib/libgdraw.so
 lib/libgdraw.so.1
@@ -10,9 +9,11 @@ lib/libgunicode.so.2
 libdata/pkgconfig/fontforge.pc
 share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
+share/locale/gr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
 share/locale/ru/LC_MESSAGES/FontForge.mo
+share/locale/vi/LC_MESSAGES/FontForge.mo
 %%DOCSDIR%%/LICENSE
 %%DATADIR%%/Adobe-CNS1-4.cidmap
 %%DATADIR%%/Adobe-GB1-4.cidmap
@@ -180,6 +181,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/charinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/charinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/charview-multilayer.png
+%%PORTDOCS%%%%DOCSDIR%%/charview-quadratic.png
 %%PORTDOCS%%%%DOCSDIR%%/charview-vert.png
 %%PORTDOCS%%%%DOCSDIR%%/charview.html
 %%PORTDOCS%%%%DOCSDIR%%/charview2.png
@@ -200,6 +202,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/copyfeatures.png
 %%PORTDOCS%%%%DOCSDIR%%/corpchar.html
 %%PORTDOCS%%%%DOCSDIR%%/corpchar.txt
+%%PORTDOCS%%%%DOCSDIR%%/cpinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/cpodd.png
 %%PORTDOCS%%%%DOCSDIR%%/cubic2quad.png
 %%PORTDOCS%%%%DOCSDIR%%/cvarrowicon.png
@@ -295,6 +298,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-panose.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-private.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ps.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-psuid.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-size.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-statemach.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-subsup.png
@@ -303,6 +307,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfname-bigedit.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfname.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo-ttfvals.png
+%%PORTDOCS%%%%DOCSDIR%%/fontinfo-unicode.png
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/fontinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/fontutils.html
@@ -316,6 +321,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/future.html
 %%PORTDOCS%%%%DOCSDIR%%/fv-normal.png
 %%PORTDOCS%%%%DOCSDIR%%/fv-smallcaps.png
+%%PORTDOCS%%%%DOCSDIR%%/fvOutOfDateHinting.png
 %%PORTDOCS%%%%DOCSDIR%%/generate.html
 %%PORTDOCS%%%%DOCSDIR%%/generate.png
 %%PORTDOCS%%%%DOCSDIR%%/getinfo.html
@@ -327,6 +333,9 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/groups.html
 %%PORTDOCS%%%%DOCSDIR%%/helpmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/hexley.png
+%%PORTDOCS%%%%DOCSDIR%%/hintboundingbox.png
+%%PORTDOCS%%%%DOCSDIR%%/hintdiagonalends.png
+%%PORTDOCS%%%%DOCSDIR%%/hintdiagonalinter.png
 %%PORTDOCS%%%%DOCSDIR%%/hinting.html
 %%PORTDOCS%%%%DOCSDIR%%/hintmaskinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/hintsmenu.html
@@ -382,6 +391,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/manual-ja.png
 %%PORTDOCS%%%%DOCSDIR%%/markclass.png
 %%PORTDOCS%%%%DOCSDIR%%/mergepost.png
+%%PORTDOCS%%%%DOCSDIR%%/o1.png
 %%PORTDOCS%%%%DOCSDIR%%/mergepre.png
 %%PORTDOCS%%%%DOCSDIR%%/metricsmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/metricsview.html
@@ -407,7 +417,6 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/non-standard.html
 %%PORTDOCS%%%%DOCSDIR%%/nvd.html
 %%PORTDOCS%%%%DOCSDIR%%/o-baddir.png
-%%PORTDOCS%%%%DOCSDIR%%/o1.png
 %%PORTDOCS%%%%DOCSDIR%%/o2.png
 %%PORTDOCS%%%%DOCSDIR%%/o3.png
 %%PORTDOCS%%%%DOCSDIR%%/o4.png
@@ -439,6 +448,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/pointinfo-interp.png
 %%PORTDOCS%%%%DOCSDIR%%/pointmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/pointsize.png
+%%PORTDOCS%%%%DOCSDIR%%/prefs-accent.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-apps.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-editing.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-font.png
@@ -446,6 +456,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/prefs-macfeat.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-macmap.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs-script.png
+%%PORTDOCS%%%%DOCSDIR%%/prefs-tt.png
 %%PORTDOCS%%%%DOCSDIR%%/prefs.html
 %%PORTDOCS%%%%DOCSDIR%%/print.html
 %%PORTDOCS%%%%DOCSDIR%%/privatekey.png
@@ -465,9 +476,12 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/rparen-174.png
 %%PORTDOCS%%%%DOCSDIR%%/rplref.png
 %%PORTDOCS%%%%DOCSDIR%%/rplserifs.png
+%%PORTDOCS%%%%DOCSDIR%%/ruler.png
 %%PORTDOCS%%%%DOCSDIR%%/running.html
 %%PORTDOCS%%%%DOCSDIR%%/sans-serif-def.png
 %%PORTDOCS%%%%DOCSDIR%%/script-A.png
+%%PORTDOCS%%%%DOCSDIR%%/scripting-alpha.html
+%%PORTDOCS%%%%DOCSDIR%%/scripting-tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/scripting.html
 %%PORTDOCS%%%%DOCSDIR%%/scriptlist-pulldown.png
 %%PORTDOCS%%%%DOCSDIR%%/scriptlist.png
@@ -525,6 +539,8 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/tutorial-zh_TW.png
 %%PORTDOCS%%%%DOCSDIR%%/twolines.png
 %%PORTDOCS%%%%DOCSDIR%%/typofeat.html
+%%PORTDOCS%%%%DOCSDIR%%/uitranslationnotes.html
+%%PORTDOCS%%%%DOCSDIR%%/uninstall.html
 %%PORTDOCS%%%%DOCSDIR%%/viewmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/views.html
 %%PORTDOCS%%%%DOCSDIR%%/vms-install.html
@@ -541,6 +557,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/flags/StarsStripes.gif
 %%PORTDOCS%%%%DOCSDIR%%/flags/Tricolor.gif
 %%PORTDOCS%%%%DOCSDIR%%/flags/UnionJack.gif
+%%PORTDOCS%%%%DOCSDIR%%/flags/VietnamFlag.png
 %%PORTDOCS%%%%DOCSDIR%%/flags/taiwan.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/AA-Comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/AmbrosiaFV.png
@@ -608,6 +625,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/files.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontcompdlg.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontcompresults.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/fontforge_ja_htdocs-20060822.tar.bz2
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-comment.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-macstyle.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/fontinfo-panose.png
@@ -683,6 +701,8 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/ref-caveats.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/rgetinfo.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/running.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/scripting-alpha.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/scripting-tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/scripting.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/scriptnotes.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/search.html
@@ -700,6 +720,7 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 %%PORTDOCS%%%%DOCSDIR%%/ja/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/ttfinstrs.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/typofeat.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/uninstall.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/viewmenu.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/views.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/vms-install.html
@@ -714,3 +735,5 @@ share/locale/ru/LC_MESSAGES/FontForge.mo
 @dirrm %%DOCSDIR%%/ja/nonBMP
 @dirrm %%DOCSDIR%%/ja
 @dirrm %%DOCSDIR%%
+@dirrmtry share/locale/gr/LC_MESSAGES
+@dirrmtry share/locale/gr