4 files changed, 36 insertions, 39 deletions

diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile
index b59a358d9678..17c6dc7ac4c3 100644
--- a/math/liborigin/Makefile
+++ b/math/liborigin/Makefile
@@ -1,43 +1,33 @@
-# New ports collection makefile for:	liborigin
-# Date created:		2006-08-26
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	liborigin
-PORTVERSION=	20070926
-PORTREVISION=	1
+PORTVERSION=	2.0.0
+PORTEPOCH=	1
 CATEGORIES=	math
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2007
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2.0
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	Tools for importing OriginLab .OPJ files
+COMMENT=	Library and utility for reading OriginLab project files
 
-CONFLICTS=	LabPlot-1.5.*
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:${PORTSDIR}/devel/boost-libs
 
-PLIST_FILES=	bin/opj2dat \
-		include/${PORTNAME}/OPJFile.h \
-		include/${PORTNAME}/tree.hh \
-		lib/liborigin.so \
-		lib/liborigin.so.0
-PLIST_DIRS=	include/${PORTNAME}
+CONFLICTS_INSTALL=	labplot-2.*
 
+USES=		cmake:outsource
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOXYGEN
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDOXYGEN}
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|g++|${CXX}|; \
-		s|^\(CFLAGS.*=\)|\1${CXXFLAGS} |' \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/opj2dat ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/OPJFile.h ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/tree.hh ${PREFIX}/include/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/liborigin.so.0.0.3 ${PREFIX}/lib/liborigin.so.0
-	${LN} -fs ${PREFIX}/lib/liborigin.so.0 ${PREFIX}/lib/liborigin.so
+	${REINPLACE_CMD} -e '/find_package(Doxygen)/d' ${WRKSRC}/CMakeLists.txt
+.endif
 
 .include <bsd.port.mk>
diff --git a/math/liborigin/distinfo b/math/liborigin/distinfo
index 3fbdb2725668..4418a00be1a9 100644
--- a/math/liborigin/distinfo
+++ b/math/liborigin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liborigin-20070926.tar.gz) = 4c52d5fdc7d4c875d41710c9172f4fadc02e9672760490a4bdb6f92ba9c6dff9
-SIZE (liborigin-20070926.tar.gz) = 46573
+SHA256 (liborigin-2.0.0.tar.gz) = ccd3771ec2437af6603ab449c34dc04876951144e835a2ef1882ac16a7094304
+SIZE (liborigin-2.0.0.tar.gz) = 145441
diff --git a/math/liborigin/pkg-descr b/math/liborigin/pkg-descr
index 1cd927b22ae6..bf9095da8507 100644
--- a/math/liborigin/pkg-descr
+++ b/math/liborigin/pkg-descr
@@ -1,11 +1,7 @@
-liborigin and opj2dat - library and tool for reading
-OriginLab OPJ project files
+Library and cli utility for reading data from OriginLab OPJ project files.
+Supported OPJ versions: 6.0 - 8.1
 
-Usage :
-	$ ./opj2dat <project.opj>
-
-FEATURES :
-	* reads any worksheets with all columns
-	* supports 4.1, 5.0, 6.0, 6.1, 7.0, 7.5 projects
+Usage:
+	opj2dat <project.opj>
 
 WWW: http://sourceforge.net/projects/liborigin/
diff --git a/math/liborigin/pkg-plist b/math/liborigin/pkg-plist
new file mode 100644
index 000000000000..597ce5796832
--- /dev/null
+++ b/math/liborigin/pkg-plist
@@ -0,0 +1,11 @@
+bin/opj2dat
+include/liborigin/OriginFile.h
+include/liborigin/OriginObj.h
+include/liborigin/OriginParser.h
+include/liborigin/config.h
+include/liborigin/tree.hh
+lib/liborigin.a
+lib/liborigin.so
+lib/liborigin.so.2
+lib/liborigin.so.2.0.0
+@dirrm include/liborigin