From 6e9971b67370a42fe1894d9eeb9dd30c408640fc Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Mon, 14 Nov 2016 17:59:46 +0000 Subject: [PATCH] - Update geany and geany-plugins to 1.29 - Convert to USES=localbase - geanylipsum plugin renamed to lipsum --- devel/geany-plugin-lipsum/pkg-plist | 12 ++++++------ devel/geany-plugins/distinfo | 6 +++--- devel/geany-plugins/files/Makefile.common | 3 +-- devel/geany-plugins/files/bsd.geany-plugins.mk | 4 ++-- devel/geany/Makefile | 8 +++----- devel/geany/distinfo | 6 +++--- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/devel/geany-plugin-lipsum/pkg-plist b/devel/geany-plugin-lipsum/pkg-plist index 5c89125db76a..8804816a4461 100644 --- a/devel/geany-plugin-lipsum/pkg-plist +++ b/devel/geany-plugin-lipsum/pkg-plist @@ -1,6 +1,6 @@ -lib/geany/geanylipsum.so -%%DOCSDIR%%/geanylipsum/AUTHORS -%%DOCSDIR%%/geanylipsum/COPYING -%%DOCSDIR%%/geanylipsum/ChangeLog -%%DOCSDIR%%/geanylipsum/NEWS -%%DOCSDIR%%/geanylipsum/README +lib/geany/lipsum.so +%%DOCSDIR%%/lipsum/AUTHORS +%%DOCSDIR%%/lipsum/COPYING +%%DOCSDIR%%/lipsum/ChangeLog +%%DOCSDIR%%/lipsum/NEWS +%%DOCSDIR%%/lipsum/README diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo index 48ce69726918..cf524b3a4e1a 100644 --- a/devel/geany-plugins/distinfo +++ b/devel/geany-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468238578 -SHA256 (geany-plugins-1.28.tar.bz2) = b13471e0a4cb76d04a96bb21c965087b50c16390edee0c6b3bbd920d8ac17745 -SIZE (geany-plugins-1.28.tar.bz2) = 3196849 +TIMESTAMP = 1479115670 +SHA256 (geany-plugins-1.29.tar.bz2) = 2827e0cf8f58a45759c82b690af5401dbd3ea0ec8dac310e4caea55547637bd7 +SIZE (geany-plugins-1.29.tar.bz2) = 3199885 diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common index f9ba3d40db70..7cae930099fc 100644 --- a/devel/geany-plugins/files/Makefile.common +++ b/devel/geany-plugins/files/Makefile.common @@ -17,8 +17,7 @@ USE_GNOME+= gtk20 intltool .if ${PORTNAME} == "geany-plugins-l10n" GEANY_PLUGIN= po po_SWITCH= --enable-nls -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES+= localbase .else INSTALL_TARGET= install-strip .endif diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk index 00662c37c5a4..42ed1a620afe 100644 --- a/devel/geany-plugins/files/bsd.geany-plugins.mk +++ b/devel/geany-plugins/files/bsd.geany-plugins.mk @@ -1,6 +1,6 @@ # $FreeBSD$ -GEANY_VER= 1.28 +GEANY_VER= 1.29 GEANY_PLUGINS_ALL= addons \ autoclose \ automark \ @@ -93,7 +93,7 @@ extrasel_DIR= geanyextrasel gendoc_DIR= geanygendoc insertnum_DIR= geanyinsertnum latex_DIR= geanylatex -lipsum_DIR= geanylipsum +lipsum_DIR= lipsum lua_DIR= geanylua macro_DIR= geanymacro miniscript_DIR= geanyminiscript diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 4cffe860a7be..5fc728d765b6 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= geany -PORTVERSION= 1.28 +PORTVERSION= 1.29 CATEGORIES= devel editors MASTER_SITES= http://download.geany.org/ SF @@ -14,10 +14,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= gtk20 intltool -USES= desktop-file-utils gettext-tools \ - gmake libtool pathfix pkgconfig tar:bzip2 -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES= desktop-file-utils gettext-tools gmake libtool \ + localbase pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/devel/geany/distinfo b/devel/geany/distinfo index 34983a2f2e83..c4eba7881f1b 100644 --- a/devel/geany/distinfo +++ b/devel/geany/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468238530 -SHA256 (geany-1.28.tar.bz2) = f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a -SIZE (geany-1.28.tar.bz2) = 4315264 +TIMESTAMP = 1479115507 +SHA256 (geany-1.29.tar.bz2) = 394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f +SIZE (geany-1.29.tar.bz2) = 4364252