6 files changed, 47 insertions, 20 deletions

diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index f761e17208c7..1d7cc983f31e 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -6,20 +6,33 @@
 #    $MCom: ports/devel/lasi/Makefile,v 1.1 2006/10/04 20:25:40 ahze Exp $
 
 PORTNAME=	lasi
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.unifont.org/lasi/download/
+MASTER_SITES=	SF
+DISTNAME=	libLASi-${PORTVERSION}
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	C++ stream output interface for creating Postscript documents
 
 USE_GNOME=	pango pkgconfig
 USE_AUTOTOOLS=	libltdl:15
-GNU_CONFIGURE=	yes
 PKG_CONFIG_PATH=	${PREFIX}/libdata/pkgconfig
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
 
 USE_LDCONFIG=	yes
 
+USE_CMAKE=	yes
+CMAKE_ARGS+=	${WRKSRC}	\
+		-DCMAKE_INSTALL_PREFIX=${PREFIX}	\
+		-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
+
+post-install:
+	${MV} ${PREFIX}/lib/libLASi.so.0.0.1 ${PREFIX}/lib/libLASi.so.0
+.ifdef NOPORTEXAMPLES
+	${RM} -rf ${DATADIR}
+.else
+	${MV} ${DATADIR}/examples ${EXAMPLESDIR}
+	${RMDIR} ${DATADIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/lasi/distinfo b/devel/lasi/distinfo
index 433a81b7380a..ded60d62c31e 100644
--- a/devel/lasi/distinfo
+++ b/devel/lasi/distinfo
@@ -1,3 +1,3 @@
-MD5 (lasi-1.0.6.tar.gz) = 2afd4359c2708949e8aa13ab9944ce7a
-SHA256 (lasi-1.0.6.tar.gz) = 011c4d9242edce718663f0ca8e5bbffb445ce5aa3e28d8ea564fe1678ab2e4bf
-SIZE (lasi-1.0.6.tar.gz) = 466078
+MD5 (libLASi-1.1.0.tar.gz) = f18091569ed4fface75453b097c67459
+SHA256 (libLASi-1.1.0.tar.gz) = 52b186060e531f851d4b9d288dc6dba4f0ab15a6b8862377213032da39bcb8f4
+SIZE (libLASi-1.1.0.tar.gz) = 200126
diff --git a/devel/lasi/files/patch-Makefile.in b/devel/lasi/files/patch-Makefile.in
deleted file mode 100644
index 47d4b0c48335..000000000000
--- a/devel/lasi/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu May  4 09:23:54 2006
-+++ Makefile.in	Sat Jun 10 23:10:22 2006
-@@ -199,7 +199,7 @@
- 
- SUBDIRS = src
- include_HEADERS = include/LASi.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${exec_prefix}/libdata/pkgconfig
- pkgconfig_DATA = lasi.pc
- all: all-recursive
- 
diff --git a/devel/lasi/files/patch-cmake+modules+instdirs.cmake b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
new file mode 100644
index 000000000000..18fcf8b2b3c1
--- /dev/null
+++ b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
@@ -0,0 +1,8 @@
+--- cmake/modules/instdirs.cmake.orig	2008-12-31 14:43:21.000000000 -0500
++++ cmake/modules/instdirs.cmake	2008-12-31 14:44:24.000000000 -0500
+@@ -61,4 +61,4 @@
+ set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
+ set(docdir ${CMAKE_INSTALL_DATADIR}/doc/libLASi-${VERSION})
+ 
+-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
++set(DATA_DIR ${CMAKE_INSTALL_DATADIR})
diff --git a/devel/lasi/files/patch-cmake+modules+pkg-config.cmake b/devel/lasi/files/patch-cmake+modules+pkg-config.cmake
new file mode 100644
index 000000000000..72357021587e
--- /dev/null
+++ b/devel/lasi/files/patch-cmake+modules+pkg-config.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/pkg-config.cmake.orig	2008-12-31 14:38:25.000000000 -0500
++++ cmake/modules/pkg-config.cmake	2008-12-31 14:42:58.000000000 -0500
+@@ -6,7 +6,7 @@
+ if(PKG_CONFIG_EXECUTABLE)
+   message(STATUS "Looking for pkg-config - found")
+   set(pkg_config_true "")
+-  set(PKG_CONFIG_DIR ${libdir}/pkgconfig)
++  set(PKG_CONFIG_DIR ${exec_prefix}/libdata/pkgconfig)
+ else(PKG_CONFIG_EXECUTABLE)
+   message(STATUS "Looking for pkg-config - not found")
+   set(pkg_config_true "#")
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index e1b8445238fb..4de19806f1f3 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -1,6 +1,12 @@
 include/LASi.h
-lib/libLASi.a
-lib/libLASi.la
 lib/libLASi.so
 lib/libLASi.so.0
 libdata/pkgconfig/lasi.pc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_1_Result.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_2_Result.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%