Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Nov 2012 07:47:52 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306902 - in head/textproc/sigil: . files
Message-ID:  <201211030747.qA37lqqG016344@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Sat Nov  3 07:47:51 2012
New Revision: 306902
URL: http://svn.freebsd.org/changeset/ports/306902

Log:
  . update to version 0.6.0;
  . use two line style headers;
  . strip ABI versions from LIB_DEPENDS;
  . add licence (GPLv3);
  . make use of desktopfileutils for port and package;
  . add pkgconfig build dependency;
  . remove desktop entry from Makefile (the port has got it's own);
  . remove BROKEN at FreeBSD-6.x (not supported anymore).
  
  PR:		ports/173305
  Submitted by:	bsam (me)
  Reviewed by:	Jonathan Chen <jonc@chen.org.nz> (maintainer)
  Feature safe:	yes

Added:
  head/textproc/sigil/files/patch-src_minizip_ioapi.h   (contents, props changed)
Deleted:
  head/textproc/sigil/files/patch-ZipArchive
Modified:
  head/textproc/sigil/Makefile
  head/textproc/sigil/distinfo
  head/textproc/sigil/pkg-plist

Modified: head/textproc/sigil/Makefile
==============================================================================
--- head/textproc/sigil/Makefile	Sat Nov  3 06:14:56 2012	(r306901)
+++ head/textproc/sigil/Makefile	Sat Nov  3 07:47:51 2012	(r306902)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	sigil
-# Date created:		2010-09-07
-# Whom:			Jonathan Chen <jonc@chen.org.nz>
-#
+# Created by: Jonathan Chen <jonc@chen.org.nz>
 # $FreeBSD$
-#
 
 PORTNAME=	sigil
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	Sigil-${PORTVERSION}-Code
@@ -15,31 +10,25 @@ DISTNAME=	Sigil-${PORTVERSION}-Code
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	WYSIWYG ePub editor
 
-LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
-		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
-		pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
+		xerces-c:${PORTSDIR}/textproc/xerces-c3 \
+		hunspell-1:${PORTSDIR}/textproc/hunspell \
+		pcre:${PORTSDIR}/devel/pcre
+
+LICENCE=	GPLv3
 
 USE_ZIP=	yes
 USE_CMAKE=	yes
 USE_DOS2UNIX=	CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp
 NO_WRKSUBDIR=	yes
 USE_QT4=	qmake gui svg webkit xml moc uic rcc imageformats linguist
-
-DESKTOP_ENTRIES="Sigil Editor" \
-		"${COMMENT}" \
-		"${PREFIX}/share/pixmaps/sigil.png" \
-		"sigil" \
-		"Application;" \
-		${FALSE}
+USE_GNOME=	desktopfileutils
+USE_PKGCONFIG=	build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on 6.X
-.endif
+post-install:
+	@-update-desktop-database > /dev/null
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/sigil/distinfo
==============================================================================
--- head/textproc/sigil/distinfo	Sat Nov  3 06:14:56 2012	(r306901)
+++ head/textproc/sigil/distinfo	Sat Nov  3 07:47:51 2012	(r306902)
@@ -1,2 +1,2 @@
-SHA256 (Sigil-0.5.3-Code.zip) = 9525ac3885e7d3962a85e491b271fd857e8a9430e92868e1772c3bcaeb9bc778
-SIZE (Sigil-0.5.3-Code.zip) = 12843490
+SHA256 (Sigil-0.6.0-Code.zip) = 02b95d3d1d5ad8a186212c6c60ae76fa17a98da83a748965db9546ff51903308
+SIZE (Sigil-0.6.0-Code.zip) = 12907949

Added: head/textproc/sigil/files/patch-src_minizip_ioapi.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sigil/files/patch-src_minizip_ioapi.h	Sat Nov  3 07:47:51 2012	(r306902)
@@ -0,0 +1,17 @@
+--- src/minizip/ioapi.h.orig	2012-10-27 20:24:40.000000000 +0400
++++ src/minizip/ioapi.h	2012-11-02 19:04:46.652602414 +0400
+@@ -44,7 +44,13 @@
+ #include <stdlib.h>
+ #include "zlib.h"
+ 
+-#if defined(USE_FILE32API)
++#if defined(__FreeBSD__)
++        #define FILE_FUNCTIONS_64B_BY_DEFAULT
++#else
++        #undef FILE_FUNCTIONS_64B_BY_DEFAULT
++#endif
++
++#if defined(USE_FILE32API) || defined(FILE_FUNCTIONS_64B_BY_DEFAULT)
+ #define fopen64 fopen
+ #define ftello64 ftell
+ #define fseeko64 fseek

Modified: head/textproc/sigil/pkg-plist
==============================================================================
--- head/textproc/sigil/pkg-plist	Sat Nov  3 06:14:56 2012	(r306901)
+++ head/textproc/sigil/pkg-plist	Sat Nov  3 07:47:51 2012	(r306902)
@@ -1,37 +1,50 @@
 bin/sigil
+share/applications/sigil.desktop
 share/pixmaps/sigil.png
-share/sigil/dictionaries/About.txt
-share/sigil/dictionaries/de_DE.aff
-share/sigil/dictionaries/de_DE.dic
-share/sigil/dictionaries/en_GB.aff
-share/sigil/dictionaries/en_GB.dic
-share/sigil/dictionaries/en_US.aff
-share/sigil/dictionaries/en_US.dic
-share/sigil/dictionaries/es.aff
-share/sigil/dictionaries/es.dic
-share/sigil/dictionaries/fr.aff
-share/sigil/dictionaries/fr.dic
-share/sigil/dictionaries/hyph_de_DE.dic
-share/sigil/dictionaries/hyph_en_GB.dic
-share/sigil/dictionaries/hyph_en_US.dic
-share/sigil/dictionaries/hyph_es.dic
-share/sigil/dictionaries/hyph_fr.dic
+share/sigil/examples/clip_entries.ini
+share/sigil/examples/search_entries.ini
+share/sigil/hunspell_dictionaries/About.txt
+share/sigil/hunspell_dictionaries/de_DE.aff
+share/sigil/hunspell_dictionaries/de_DE.dic
+share/sigil/hunspell_dictionaries/en_GB.aff
+share/sigil/hunspell_dictionaries/en_GB.dic
+share/sigil/hunspell_dictionaries/en_US.aff
+share/sigil/hunspell_dictionaries/en_US.dic
+share/sigil/hunspell_dictionaries/es.aff
+share/sigil/hunspell_dictionaries/es.dic
+share/sigil/hunspell_dictionaries/fr.aff
+share/sigil/hunspell_dictionaries/fr.dic
+share/sigil/hunspell_dictionaries/hyph_de_DE.dic
+share/sigil/hunspell_dictionaries/hyph_en_GB.dic
+share/sigil/hunspell_dictionaries/hyph_en_US.dic
+share/sigil/hunspell_dictionaries/hyph_es.dic
+share/sigil/hunspell_dictionaries/hyph_fr.dic
 share/sigil/translations/sigil_cs.qm
 share/sigil/translations/sigil_da_DK.qm
 share/sigil/translations/sigil_de.qm
+share/sigil/translations/sigil_el_GR.qm
 share/sigil/translations/sigil_en.qm
 share/sigil/translations/sigil_es_ES.qm
 share/sigil/translations/sigil_fr.qm
+share/sigil/translations/sigil_gl.qm
+share/sigil/translations/sigil_id_ID.qm
 share/sigil/translations/sigil_it.qm
 share/sigil/translations/sigil_ja.qm
+share/sigil/translations/sigil_km.qm
+share/sigil/translations/sigil_ko.qm
 share/sigil/translations/sigil_nl.qm
 share/sigil/translations/sigil_pl.qm
 share/sigil/translations/sigil_pt_BR.qm
+share/sigil/translations/sigil_ro_RO.qm
 share/sigil/translations/sigil_ru.qm
 share/sigil/translations/sigil_sk.qm
 share/sigil/translations/sigil_tr_TR.qm
+share/sigil/translations/sigil_ug.qm
 share/sigil/translations/sigil_zh_CN.qm
 share/sigil/translations/sigil_zh_TW.qm
 @dirrm share/sigil/translations
-@dirrm share/sigil/dictionaries
+@dirrm share/sigil/hunspell_dictionaries
+@dirrm share/sigil/examples
 @dirrm share/sigil
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211030747.qA37lqqG016344>