svn commit: r444770 - in head/textproc/sdcv: . files

Eugene Grosbein eugen at FreeBSD.org
Fri Jun 30 16:42:49 UTC 2017 

Author: eugen
Date: Fri Jun 30 16:42:47 2017
New Revision: 444770
URL: https://svnweb.freebsd.org/changeset/ports/444770

Log:
  Update textproc/sdcv to 0.5.0-beta2:
  
  - remove some patches that were integrated upstream and add new;
  - pass maintaintership to the submitter.
  
  PR:		217671
  Submitted by:	Anton Yuzhaninov <citrin at citrin.ru>
  Approved by:	vsevolod (mentor)

Added:
  head/textproc/sdcv/files/patch-CMakeLists.txt   (contents, props changed)
  head/textproc/sdcv/files/patch-src_libwrapper.cpp   (contents, props changed)
Deleted:
  head/textproc/sdcv/files/patch-src__lib__lib.cpp
  head/textproc/sdcv/files/patch-src__libwrapper.cpp
  head/textproc/sdcv/files/patch-src__readline.cpp
  head/textproc/sdcv/files/patch-src__sdcv.cpp
  head/textproc/sdcv/files/patch-src__utils.cpp
Modified:
  head/textproc/sdcv/Makefile
  head/textproc/sdcv/distinfo
  head/textproc/sdcv/files/patch-src__lib__mapfile.hpp
  head/textproc/sdcv/files/pkg-message.in
  head/textproc/sdcv/pkg-descr
  head/textproc/sdcv/pkg-plist

Modified: head/textproc/sdcv/Makefile
==============================================================================
--- head/textproc/sdcv/Makefile	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/Makefile	Fri Jun 30 16:42:47 2017	(r444770)
@@ -2,37 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	sdcv
-PORTVERSION=	0.4.2
-PORTREVISION=	4
+DISTVERSION=	0.5.0-beta2
+DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	textproc
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	citrin at citrin.ru
 COMMENT=	Text-based utility for work with dictionaries in StarDict's format
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-USES=		autoreconf gettext pkgconfig readline tar:bzip2
+USES=		cmake:outsource pkgconfig readline tar:bzip2
 USE_GNOME=	glib20
 
 SUB_FILES=	pkg-message
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DENABLE_NLS:BOOL=OFF
+
 post-patch:
 .for i in doc/sdcv.1 src/sdcv.cpp
 	@${REINPLACE_CMD} -e \
 		's|/usr/share|${PREFIX}/share|' ${WRKSRC}/${i}
 .endfor
-	@${REINPLACE_CMD} -e \
-		's|@mandir@/uk|@mandir@|' ${WRKSRC}/doc/uk/Makefile.am
-	@${REINPLACE_CMD} -e \
-		's|getopt1.c getopt.h||' ${WRKSRC}/src/Makefile.am
-	@${RM} ${WRKSRC}/src/getopt.h
-	@${REINPLACE_CMD} '/AM_GNU_GETTEXT_VERSION/s/0\.14\.1/0.19.1/' \
-		${WRKSRC}/configure.ac
+
+post-build-NLS-on:
+	cd ${BUILD_WRKSRC} && ${MAKE_CMD} lang
 
 .include <bsd.port.mk>

Modified: head/textproc/sdcv/distinfo
==============================================================================
--- head/textproc/sdcv/distinfo	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/distinfo	Fri Jun 30 16:42:47 2017	(r444770)
@@ -1,2 +1,3 @@
-SHA256 (sdcv-0.4.2.tar.bz2) = a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2
-SIZE (sdcv-0.4.2.tar.bz2) = 181384
+TIMESTAMP = 1488927916
+SHA256 (sdcv-0.5.0-beta2-Source.tar.bz2) = 386cfc96285a653c697f8baeab676cb3f1645cea029464d194872d0bbae14ffb
+SIZE (sdcv-0.5.0-beta2-Source.tar.bz2) = 51508

Added: head/textproc/sdcv/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sdcv/files/patch-CMakeLists.txt	Fri Jun 30 16:42:47 2017	(r444770)
@@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig	2013-07-07 14:55:00 UTC
++++ CMakeLists.txt
+@@ -110,6 +110,10 @@ target_link_libraries(sdcv
+   ${ZLIB_LIBRARIES}
+   ${READLINE_LIBRARY}
+ )
++set_target_properties(sdcv
++	PROPERTIES
++	LINK_FLAGS ${GLIB2_LDFLAGS}
++)
+ if (ENABLE_NLS)
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "locale")
+ endif ()
+@@ -117,8 +121,10 @@ endif ()
+ include(CPack)
+ 
+ INSTALL(TARGETS sdcv DESTINATION "bin")
+-INSTALL(FILES doc/sdcv.1 DESTINATION "share/man/man1")
+-INSTALL(FILES doc/uk/sdcv.1 DESTINATION "share/man/uk/man1")
++
++include(GNUInstallDirs)
++INSTALL(FILES doc/sdcv.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++INSTALL(FILES doc/uk/sdcv.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/uk.UTF-8/man1")
+ 
+ if (ENABLE_NLS)
+   INSTALL(DIRECTORY "${gettext_outDir}" DESTINATION "share")

Modified: head/textproc/sdcv/files/patch-src__lib__mapfile.hpp
==============================================================================
--- head/textproc/sdcv/files/patch-src__lib__mapfile.hpp	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/files/patch-src__lib__mapfile.hpp	Fri Jun 30 16:42:47 2017	(r444770)
@@ -1,6 +1,6 @@
---- src/lib/mapfile.hpp.orig
+--- src/lib/mapfile.hpp.orig	2013-07-06 22:28:17 UTC
 +++ src/lib/mapfile.hpp
-@@ -5,6 +5,9 @@
+@@ -4,6 +4,9 @@
  #  include "config.h"
  #endif
  

Added: head/textproc/sdcv/files/patch-src_libwrapper.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sdcv/files/patch-src_libwrapper.cpp	Fri Jun 30 16:42:47 2017	(r444770)
@@ -0,0 +1,11 @@
+--- src/libwrapper.cpp.orig	2013-07-07 14:34:44 UTC
++++ src/libwrapper.cpp
+@@ -285,7 +285,7 @@ namespace {
+         sdcv_pager& operator=(const sdcv_pager&) = delete;
+         ~sdcv_pager() {
+             if (output != stdout)
+-                fclose(output);
++                pclose(output);
+         }
+         FILE *get_stream() { return output; }
+     private:

Modified: head/textproc/sdcv/files/pkg-message.in
==============================================================================
--- head/textproc/sdcv/files/pkg-message.in	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/files/pkg-message.in	Fri Jun 30 16:42:47 2017	(r444770)
@@ -4,11 +4,11 @@ you have to fetch the dictionaries to make it work cor
 
 1. Make directory for dictionaries files :
 
-	# mkdir -p %%PREFIX%%/share/stardict/dict
+	# mkdir -p %%PREFIX%%/share/stardict/dic
 
 
 2. Please put your dictionary file at :
 
- 	%%PREFIX%%/share/stardict/dict/
+ 	%%PREFIX%%/share/stardict/dic/
 
 **************************************************************************

Modified: head/textproc/sdcv/pkg-descr
==============================================================================
--- head/textproc/sdcv/pkg-descr	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/pkg-descr	Fri Jun 30 16:42:47 2017	(r444770)
@@ -5,4 +5,4 @@ The word from "list of words" may be string with leadi
 search algorithm, string may contain '?' and '*' for using regexp search.
 It work in interactive and not interactive mode.
 
-WWW: http://sdcv.sourceforge.net/
+WWW: http://dushistov.github.io/sdcv/

Modified: head/textproc/sdcv/pkg-plist
==============================================================================
--- head/textproc/sdcv/pkg-plist	Fri Jun 30 15:44:08 2017	(r444769)
+++ head/textproc/sdcv/pkg-plist	Fri Jun 30 16:42:47 2017	(r444770)
@@ -1,7 +1,10 @@
 bin/sdcv
 man/man1/sdcv.1.gz
-share/locale/ru/LC_MESSAGES/sdcv.mo
-share/locale/sk/LC_MESSAGES/sdcv.mo
-share/locale/uk/LC_MESSAGES/sdcv.mo
-share/locale/zh_CN/LC_MESSAGES/sdcv.mo
-share/locale/zh_TW/LC_MESSAGES/sdcv.mo
+man/uk.UTF-8/man1/sdcv.1.gz
+%%NLS%%share/locale/cs/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/sdcv.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/sdcv.mo

More information about the svn-ports-all mailing list