- Update to 2.3.10

PR:		127462
Submitted by:	"Andrei V. Shetuhin" <reki@reki.ru> (maintainer)

4 files changed, 6 insertions, 60 deletions

diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile
index e31719862a4f..9d2907407d1c 100644
--- a/textproc/ctpp2/Makefile
+++ b/textproc/ctpp2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ctpp2
-PORTVERSION=	2.3.5
-PORTREVISION=	1
+PORTVERSION=	2.3.10
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://ctpp.havoc.ru/download/ \
 		LOCAL/glarkin
@@ -20,46 +19,4 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 
-.include <bsd.port.pre.mk>
-
-# Let me explain - GCC 3.4 does not support -mtune=generic, so
-# TUNE_PARAM is set to the platform-specific value.  If the platform
-# is not i386 nor amd64, just disable -mtune altogether.
-#
-# If the system GCC 4.2+, simply use -mtune=generic for i386 and
-# amd64.  Once again, disable -mtune for other platforms.
-.if ${OSVERSION} < 700042
-.  if ${ARCH} == "i386"
-TUNE_PARAM=i686
-HASHMARK=
-.  elif ${ARCH} == "amd64"
-TUNE_PARAM=athlon64
-HASHMARK=
-.  else
-TUNE_PARAM=
-HASHMARK=\#
-.  endif
-.else
-.  if ${ARCH} == "i386" || ${ARCH} == "amd64"
-TUNE_PARAM=generic
-HASHMARK=
-.  else
-TUNE_PARAM=
-HASHMARK=\#
-.  endif
-.endif
-
-#
-# This is not ideal, but because of the way CMakeLists.txt is structured,
-# I have to apply a 2nd patch if -mtune is not used at all (non-i386 and
-# non-amd64 arch).
-#
-.if ${TUNE_PARAM} == ""
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-CMakeLists.txt
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%TUNE_PARAM%%,${TUNE_PARAM},' \
-		-e 's,%%HASHMARK%%,${HASHMARK},' ${WRKSRC}/CMakeLists.txt
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/ctpp2/distinfo b/textproc/ctpp2/distinfo
index c01e32341328..f482e5ce2844 100644
--- a/textproc/ctpp2/distinfo
+++ b/textproc/ctpp2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ctpp2-2.3.5.tar.gz) = cd65c95100fd6bcae39aac35dd6dc8dc
-SHA256 (ctpp2-2.3.5.tar.gz) = 57363827b305514ef3d42ab6998e53f5e443141d2f84a9a3e9786e76179b8617
-SIZE (ctpp2-2.3.5.tar.gz) = 135090
+MD5 (ctpp2-2.3.10.tar.gz) = f4d388c3761d8e7f4a8449346085f8d9
+SHA256 (ctpp2-2.3.10.tar.gz) = f0c43b35cf283df9648f2b8c696be740c5a19026544cddf513a4bca54039668b
+SIZE (ctpp2-2.3.10.tar.gz) = 139093
diff --git a/textproc/ctpp2/files/patch-CMakeLists.txt.in b/textproc/ctpp2/files/patch-CMakeLists.txt.in
deleted file mode 100644
index b491ce252ab2..000000000000
--- a/textproc/ctpp2/files/patch-CMakeLists.txt.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2008-08-29 11:03:56.000000000 -0400
-+++ CMakeLists.txt	2008-08-29 11:04:01.000000000 -0400
-@@ -20,7 +20,7 @@
- OPTION(SKIP_RELINK_RPATH   "Skip relinking and full RPATH for the install tree" OFF)
- 
- # uild optimized code for following CPU (default i386)
--SET(CPU_TUNE               "i686")
-+%%HASHMARK%%SET(CPU_TUNE               "%%TUNE_PARAM%%")
- 
- SET(CTPP_FLOAT_PRECISION   12)
- 
diff --git a/textproc/ctpp2/pkg-plist b/textproc/ctpp2/pkg-plist
index a84fe831c9e5..4205fa106b44 100644
--- a/textproc/ctpp2/pkg-plist
+++ b/textproc/ctpp2/pkg-plist
@@ -48,7 +48,7 @@ include/ctpp2/VMSyscall.hpp
 lib/libctpp2-st.a
 lib/libctpp2.so
 lib/libctpp2.so.2
-lib/libctpp2.so.2.3.5
+lib/libctpp2.so.2.3.10
 share/locale/ru_RU.CP1251/LC_MESSAGES/ctpp2.mo
 share/locale/ru_RU.KOI8-R/LC_MESSAGES/ctpp2.mo
 @dirrmtry share/locale/ru_RU.KOI8-R/LC_MESSAGES