4 files changed, 28 insertions, 56 deletions

diff --git a/textproc/ctpp/Makefile b/textproc/ctpp/Makefile
index 90d3b0a57fac..967b1de0fd28 100644
--- a/textproc/ctpp/Makefile
+++ b/textproc/ctpp/Makefile
@@ -6,31 +6,30 @@
 #
 
 PORTNAME=	ctpp
-PORTVERSION=	1.7.5
+PORTVERSION=	1.8.0
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://www.reki.ru/products/ctpp/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library to use templates in C/C++ projects
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-.if defined(WITH_CTPP_PERF_TUNING)
-CONFIGURE_ARGS+=	--enable-optimization
-.endif
-
-.if defined(WITH_CTPP_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+do-configure:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/cmake ${WRKSRC}
 
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/libctpp-st.a ${PREFIX}/lib/libctpp.a
+	${INSTALL_DATA} ${WRKSRC}/libctpp.so.1.8.0 ${PREFIX}/lib/libctpp.so
+	@${MKDIR} ${PREFIX}/include/ctpp
+	cd ${WRKSRC}/include && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/include/ctpp
 .if !defined(NOPORTDOCS)
-INSTALL_TARGET=	install install-doc
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-post-patch:
-	@${RM} -f ${WRKSRC}/obj/*.o
-
 .include <bsd.port.mk>
diff --git a/textproc/ctpp/distinfo b/textproc/ctpp/distinfo
index 706823e6c5ee..1444337e5e26 100644
--- a/textproc/ctpp/distinfo
+++ b/textproc/ctpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ctpp-1.7.5.tar.gz) = 3d82e2cf6a4d90e7920f6aa6ba90c963
-SHA256 (ctpp-1.7.5.tar.gz) = c9fbadf29041eaf0dc7388cbb978649a4c6360cf53fd2f6e45a870856eba986b
-SIZE (ctpp-1.7.5.tar.gz) = 269277
+MD5 (ctpp-1.8.0.tar.gz) = 7f3647d44086ee8e6624179365aea9a0
+SHA256 (ctpp-1.8.0.tar.gz) = 573ebeab767173e3d204f7a9c211b6f909b45041a9539f41a5861a81ad36e1c7
+SIZE (ctpp-1.8.0.tar.gz) = 142189
diff --git a/textproc/ctpp/files/patch-Makefile.in b/textproc/ctpp/files/patch-Makefile.in
deleted file mode 100644
index c9aa8ee1ef48..000000000000
--- a/textproc/ctpp/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Wed Feb  9 10:50:31 2005
-+++ Makefile.in	Sat Mar 25 17:56:33 2006
-@@ -74,9 +74,11 @@
- 			fi; \
- 		fi; \
- 	done;
-+
-+install-doc::
- 	@echo -------------------------------------- Installing documentation ----------
--	if test ! -d "$(PREFIX)/doc"; then \
--		$(INSTALL) -d -m 0755 $(PREFIX)/doc; \
-+	if test ! -d "$(PREFIX)/share/doc"; then \
-+		$(INSTALL) -d -m 0755 $(PREFIX)/share/doc; \
- 	fi; \
- 	ELEM_LIST=`ls -R -1 $(BUILDROOT)/doc | sed 's!:$$!!';` ; \
- 	CURR_DIR=''; \
-@@ -85,10 +87,10 @@
- 			EXCL_PATH=`echo $(BUILDROOT)/doc | sed 's!\.!\\\\.!g'`; \
- 			INST_PATH=`eval "echo $$ELEMENT | sed 's!^$$EXCL_PATH!!g'"`; \
- 			CURR_DIR=$$ELEMENT; \
--			$(INSTALL) -d -m 0755 $(PREFIX)/doc/$$INST_PATH; \
-+			$(INSTALL) -d -m 0755 $(PREFIX)/share/doc/ctpp/$$INST_PATH; \
- 		else \
- 			if test -f "$$CURR_DIR/$$ELEMENT"; then \
--				$(INSTALL) -m 0644 $$CURR_DIR/$$ELEMENT $(PREFIX)/doc/$$INST_PATH/$$ELEMENT; \
-+				$(INSTALL) -m 0644 $$CURR_DIR/$$ELEMENT $(PREFIX)/share/doc/ctpp/$$INST_PATH/$$ELEMENT; \
- 			fi; \
- 		fi; \
- 	done;
diff --git a/textproc/ctpp/pkg-plist b/textproc/ctpp/pkg-plist
index bfc40d1d9c19..4349b9dbc0bc 100644
--- a/textproc/ctpp/pkg-plist
+++ b/textproc/ctpp/pkg-plist
@@ -1,3 +1,5 @@
+include/ctpp/ctpp/Hash.hpp
+include/ctpp/ctpp/Types.h
 include/ctpp/ctpp/ctpp.hpp
 include/ctpp/ctpp/ctpp_c.h
 include/ctpp/ctpp/param_data.hpp
@@ -13,13 +15,16 @@ include/ctpp/functions/udf_sprintf.hpp
 include/ctpp/functions/urlescape.hpp
 include/ctpp/functions/value_in_set.hpp
 include/ctpp/util/d2str.hpp
-lib/libctpp.so
 lib/libctpp.a
+lib/libctpp.so
 %%PORTDOCS%%%%DOCSDIR%%/en/ctpp.chm
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.css
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhc
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhk
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhp
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_compile.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_context_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_cover.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.css
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_def.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_algorithm.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_api.html
@@ -36,9 +41,6 @@ lib/libctpp.a
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_re.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_sprintf.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_urlescape.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhc
-%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhk
-%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhp
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_intro.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_license.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_operators.html
@@ -51,10 +53,13 @@ lib/libctpp.a
 %%PORTDOCS%%%%DOCSDIR%%/en/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/index_left.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/ctpp.chm
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.css
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhc
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhk
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhp
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_compile.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_context_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_cover.html
-%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.css
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_def.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_algorithm.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_api.html
@@ -71,9 +76,6 @@ lib/libctpp.a
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_re.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_sprintf.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_urlescape.html
-%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhc
-%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhk
-%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhp
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_intro.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_license.html
 %%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_operators.html