4 files changed, 96 insertions, 90 deletions

diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index e8fa5536e392..408ca14a898c 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cuneiform
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://launchpadlibrarian.net/51166054/
+MASTER_SITES=	http://launchpadlibrarian.net/69906918/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
 
 MAINTAINER=	samm@os2.kiev.ua
@@ -41,8 +41,6 @@ post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-patch:
-	${MV} ${WRKSRC}/cuneiform_src/Kern/hrstr/strings.h \
-		${WRKSRC}/cuneiform_src/Kern/hrstr/cf_strings.h
 	${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
 		${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h
 .if !defined(WITH_IMAGEMAGICK)
diff --git a/graphics/cuneiform/distinfo b/graphics/cuneiform/distinfo
index 8c3ce238fcda..8b45768fa7b8 100644
--- a/graphics/cuneiform/distinfo
+++ b/graphics/cuneiform/distinfo
@@ -1,3 +1,2 @@
-MD5 (cuneiform-linux-1.0.0.tar.bz2) = 785232ffffad7d82446fbac08a1c3ef9
-SHA256 (cuneiform-linux-1.0.0.tar.bz2) = bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e
-SIZE (cuneiform-linux-1.0.0.tar.bz2) = 26387208
+SHA256 (cuneiform-linux-1.1.0.tar.bz2) = 577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad
+SIZE (cuneiform-linux-1.1.0.tar.bz2) = 26388511
diff --git a/graphics/cuneiform/files/patch-strings.h b/graphics/cuneiform/files/patch-strings.h
deleted file mode 100644
index 72b7d6df77e9..000000000000
--- a/graphics/cuneiform/files/patch-strings.h
+++ /dev/null
@@ -1,37 +0,0 @@
---- cuneiform_src/Kern/hhh/tigerh/h/c_types.h	2010-06-30 13:54:18.000000000 +0300
-+++ cuneiform_src/Kern/hhh/tigerh/h/c_types.h	2010-09-06 03:21:03.000000000 +0300
-@@ -79,12 +79,6 @@
- /*--------------------- Include standart h-files -----------------------*/
- 
- #include <stdio.h>
--
--/* solves conflict with bsd <strings.h> */
--#if defined(__FreeBSD__)
--#undef __BSD_VISIBLE
--#endif
--
- #include <string.h>
- 
- #include "cttypes.h"
---- cuneiform_src/Kern/hhh/tigerh/h/extract.h	2010-06-30 13:54:25.000000000 +0300
-+++ cuneiform_src/Kern/hhh/tigerh/h/extract.h	2010-09-06 03:21:12.000000000 +0300
-@@ -83,7 +83,7 @@
- # include "c_types.h"
- # include "lterrors.h"
- # include "roots.h"
--# include "strings.h"
-+# include "cf_strings.h"
- # include "madebug.h"
- # include "layout.h"
- 
---- cuneiform_src/Kern/hrstr/extract.h	2010-06-30 13:54:25.000000000 +0300
-+++ cuneiform_src/Kern/hrstr/extract.h	2010-09-06 03:20:48.000000000 +0300
-@@ -72,7 +72,7 @@
- 
- # include "lterrors.h"
- # include "roots.h"
--# include "strings.h"
-+# include "cf_strings.h"
- # include "madebug.h"
- # include "layout.h"
- 
diff --git a/graphics/cuneiform/pkg-plist b/graphics/cuneiform/pkg-plist
index a22c68c0fc4f..8bc2f2f5eb93 100644
--- a/graphics/cuneiform/pkg-plist
+++ b/graphics/cuneiform/pkg-plist
@@ -1,97 +1,143 @@
 bin/cuneiform
 include/cuneiform.h
 lib/libccom.so
-lib/libccom.so.1.0.0
+lib/libccom.so.0
+lib/libccom.so.1.1.0
 lib/libced.so
-lib/libced.so.1.0.0
+lib/libced.so.0
+lib/libced.so.1.1.0
 lib/libcfcompat.so
-lib/libcfcompat.so.1.0.0
+lib/libcfcompat.so.0
+lib/libcfcompat.so.1.1.0
 lib/libcfio.so
-lib/libcfio.so.1.0.0
+lib/libcfio.so.0
+lib/libcfio.so.1.1.0
 lib/libcimage.so
-lib/libcimage.so.1.0.0
+lib/libcimage.so.0
+lib/libcimage.so.1.1.0
 lib/libcline.so
-lib/libcline.so.1.0.0
+lib/libcline.so.0
+lib/libcline.so.1.1.0
 lib/libcpage.so
-lib/libcpage.so.1.0.0
+lib/libcpage.so.0
+lib/libcpage.so.1.1.0
 lib/libcpu32.so
-lib/libcpu32.so.1.0.0
+lib/libcpu32.so.0
+lib/libcpu32.so.1.1.0
 lib/libcstr.so
-lib/libcstr.so.1.0.0
+lib/libcstr.so.0
+lib/libcstr.so.1.1.0
 lib/libctb32.so
-lib/libctb32.so.1.0.0
+lib/libctb32.so.0
+lib/libctb32.so.1.1.0
 lib/libcuneiform.so
-lib/libcuneiform.so.1.0.0
+lib/libcuneiform.so.0
+lib/libcuneiform.so.1.1.0
 lib/libdif32.so
-lib/libdif32.so.1.0.0
+lib/libdif32.so.0
+lib/libdif32.so.1.1.0
 lib/libevn32.so
-lib/libevn32.so.1.0.0
+lib/libevn32.so.0
+lib/libevn32.so.1.1.0
 lib/libexc.so
-lib/libexc.so.1.0.0
+lib/libexc.so.0
+lib/libexc.so.1.1.0
 lib/libfon32.so
-lib/libfon32.so.1.0.0
+lib/libfon32.so.0
+lib/libfon32.so.1.1.0
 lib/libleo32.so
-lib/libleo32.so.1.0.0
+lib/libleo32.so.0
+lib/libleo32.so.1.1.0
 lib/liblns32.so
-lib/liblns32.so.1.0.0
+lib/liblns32.so.0
+lib/liblns32.so.1.1.0
 lib/libloc32.so
-lib/libloc32.so.1.0.0
+lib/libloc32.so.0
+lib/libloc32.so.1.1.0
 lib/libmmx32.so
-lib/libmmx32.so.1.0.0
+lib/libmmx32.so.0
+lib/libmmx32.so.1.1.0
 lib/libmsk32.so
-lib/libmsk32.so.1.0.0
+lib/libmsk32.so.0
+lib/libmsk32.so.1.1.0
 lib/libpass2.so
-lib/libpass2.so.1.0.0
+lib/libpass2.so.0
+lib/libpass2.so.1.1.0
 lib/libr3532.so
-lib/libr3532.so.1.0.0
+lib/libr3532.so.0
+lib/libr3532.so.1.1.0
 lib/librbal.so
-lib/librbal.so.1.0.0
+lib/librbal.so.0
+lib/librbal.so.1.1.0
 lib/librblock.so
-lib/librblock.so.1.0.0
+lib/librblock.so.0
+lib/librblock.so.1.1.0
 lib/librcorrkegl.so
-lib/librcorrkegl.so.1.0.0
+lib/librcorrkegl.so.0
+lib/librcorrkegl.so.1.1.0
 lib/librcutp.so
-lib/librcutp.so.1.0.0
+lib/librcutp.so.0
+lib/librcutp.so.1.1.0
 lib/librdib.so
-lib/librdib.so.1.0.0
+lib/librdib.so.0
+lib/librdib.so.1.1.0
 lib/librfrmt.so
-lib/librfrmt.so.1.0.0
+lib/librfrmt.so.0
+lib/librfrmt.so.1.1.0
 lib/librimage.so
-lib/librimage.so.1.0.0
+lib/librimage.so.0
+lib/librimage.so.1.1.0
 lib/librline.so
-lib/librline.so.1.0.0
+lib/librline.so.0
+lib/librline.so.1.1.0
 lib/librling.so
-lib/librling.so.1.0.0
+lib/librling.so.0
+lib/librling.so.1.1.0
 lib/librlings.so
-lib/librlings.so.1.0.0
+lib/librlings.so.0
+lib/librlings.so.1.1.0
 lib/librmarker.so
-lib/librmarker.so.1.0.0
+lib/librmarker.so.0
+lib/librmarker.so.1.1.0
 lib/librneg.so
-lib/librneg.so.1.0.0
+lib/librneg.so.0
+lib/librneg.so.1.1.0
 lib/librout.so
-lib/librout.so.1.0.0
+lib/librout.so.0
+lib/librout.so.1.1.0
 lib/librpic.so
-lib/librpic.so.1.0.0
+lib/librpic.so.0
+lib/librpic.so.1.1.0
 lib/librpstr.so
-lib/librpstr.so.1.0.0
+lib/librpstr.so.0
+lib/librpstr.so.1.1.0
 lib/librreccom.so
-lib/librreccom.so.1.0.0
+lib/librreccom.so.0
+lib/librreccom.so.1.1.0
 lib/librsadd.so
-lib/librsadd.so.1.0.0
+lib/librsadd.so.0
+lib/librsadd.so.1.1.0
 lib/librselstr.so
-lib/librselstr.so.1.0.0
+lib/librselstr.so.0
+lib/librselstr.so.1.1.0
 lib/librshelllines.so
-lib/librshelllines.so.1.0.0
+lib/librshelllines.so.0
+lib/librshelllines.so.1.1.0
 lib/librstr.so
-lib/librstr.so.1.0.0
+lib/librstr.so.0
+lib/librstr.so.1.1.0
 lib/librstuff.so
-lib/librstuff.so.1.0.0
+lib/librstuff.so.0
+lib/librstuff.so.1.1.0
 lib/librverline.so
-lib/librverline.so.1.0.0
+lib/librverline.so.0
+lib/librverline.so.1.1.0
 lib/libsmetric.so
-lib/libsmetric.so.1.0.0
+lib/libsmetric.so.0
+lib/libsmetric.so.1.1.0
 lib/libstd32.so
-lib/libstd32.so.1.0.0
+lib/libstd32.so.0
+lib/libstd32.so.1.1.0
 %%DATADIR%%/cube16pd.dat
 %%DATADIR%%/cube16pl.dat
 %%DATADIR%%/cube16pr.dat