Page MenuHomeFreeBSD
Files F142407346

D18018.id50528.diff
No OneTemporary
Actions

D18018.id50528.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,32 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20181116
+ AFFECTS: users of devel/geany and devel/geaany-plugins
+ AUTHOR: madpilot@FreeBSD.org
+
+ A new gtk3 flavor has been added to the geany ports. The gtk2
+ version maintains the old package name, so nothing must be done
+ if you want to stay with that. the gtk3 flavor adds a "-gtk3"
+ postfix to the package names.
+
+ To update to the gtk3 version with binary packages you can install
+ the new packages (with the -gtk3 postfix) with "pkg install" for
+ geany and any installed plugin, pkg will figure out the conflicts
+ and disinstall the gtk2 versions.
+
+ To update using ports you should deinstall all the geany and
+ geany-plugins ports and reinstal the gtk3 flavor ones.
+
+ Note that the following plugins are not available if using the
+ gtk3 flavor:
+
+ * geany-plugin-geanypy
+ * geany-plugin-scope
+ * geany-plugin-debugger
+ * geany-plugin-multiterm
+ * geany-plugin-devhelp
+
20181111
AFFECTS: users of graphics/mesa-libs
AUTHOR: jbeich@FreeBSD.org
Index: devel/geany-plugin-debugger/Makefile
===================================================================
--- devel/geany-plugin-debugger/Makefile
+++ devel/geany-plugin-debugger/Makefile
@@ -7,6 +7,7 @@
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
+USES= gnome
USE_GNOME= vte
USE_XORG= x11 xext
Index: devel/geany-plugin-markdown/Makefile
===================================================================
--- devel/geany-plugin-markdown/Makefile
+++ devel/geany-plugin-markdown/Makefile
@@ -7,10 +7,16 @@
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
-LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
- libsoup-2.4.so:devel/libsoup
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
OPTIONS_DEFINE= DOCS
.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+
+.if ${FLAVOR} == gtk2
+LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2
+.elif ${FLAVOR} == gtk3
+LIB_DEPENDS+= libwebkitgtk-3.0.so:www/webkit-gtk3
+.endif
+
.include <bsd.port.mk>
Index: devel/geany-plugin-vc/Makefile
===================================================================
--- devel/geany-plugin-vc/Makefile
+++ devel/geany-plugin-vc/Makefile
@@ -11,8 +11,14 @@
OPTIONS_DEFAULT= GTKSPELL
GTKSPELL_DESC= Spell checking support via GtkSpell
-GTKSPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
GTKSPELL_CONFIGURE_ENABLE= gtkspell
.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+
+.if ${FLAVOR} == gtk2
+GTKSPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
+.elif ${FLAVOR} == gtk3
+GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3
+.endif
+
.include <bsd.port.mk>
Index: devel/geany-plugin-webhelper/Makefile
===================================================================
--- devel/geany-plugin-webhelper/Makefile
+++ devel/geany-plugin-webhelper/Makefile
@@ -7,8 +7,14 @@
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
-LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
- libsoup-2.4.so:devel/libsoup
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+
+.if ${FLAVOR} == gtk2
+LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2
+.elif ${FLAVOR} == gtk3
+LIB_DEPENDS+= libwebkitgtk-3.0.so:www/webkit-gtk3
+.endif
+
.include <bsd.port.mk>
Index: devel/geany-plugins/Makefile
===================================================================
--- devel/geany-plugins/Makefile
+++ devel/geany-plugins/Makefile
@@ -3,25 +3,39 @@
PORTNAME= geany-plugins
PORTVERSION= ${GEANY_VER}
+PORTREVISION= 1
CATEGORIES= devel
DISTFILES= # none
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Geany plugins (meta port)
+FLAVORS= gtk2 gtk3
+FLAVOR?= ${FLAVORS:[1]}
+
+gtk2_CONFLICTS_INSTALL= geany-plugins-gtk3
+
+gtk3_PKGNAMESUFFIX= -gtk3
+gtk3_CONFLICTS_INSTALL= geany-plugins
+
USES= metaport
-OPTIONS_DEFINE= NLS ${GEANY_PLUGINS_ALL:tu}
-OPTIONS_DEFAULT= ${GEANY_PLUGINS_ALL:tu}
+OPTIONS_DEFINE= NLS ${GEANY_PLUGINS:tu}
+OPTIONS_DEFAULT= ${GEANY_PLUGINS:tu}
NO_OPTIONS_SORT= yes
.include "${.CURDIR}/files/bsd.geany-plugins.mk"
-.for plugin in ${GEANY_PLUGINS_ALL}
+.if ${FLAVOR} == gtk2
+GEANY_PLUGINS= ${GEANY_PLUGINS_ALL} ${GEANY_PLUGINS_GTK2}
+.elif ${FLAVOR} == gtk3
+GEANY_PLUGINS= ${GEANY_PLUGINS_ALL}
+.endif
+
+.for plugin in ${GEANY_PLUGINS}
${plugin:tu}_DESC= ${${plugin}_DESC}
-${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
+${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}${PKGNAMESUFFIX}>=0:devel/geany-plugin-${plugin}@${FLAVOR}
.endfor
-
-NLS_RUN_DEPENDS= geany-plugins-l10n>=0:devel/geany-plugins-l10n
+NLS_RUN_DEPENDS= geany-plugins-l10n${PKGNAMESUFFIX}>=0:devel/geany-plugins-l10n@${FLAVOR}
.include <bsd.port.mk>
Index: devel/geany-plugins/files/Makefile.common
===================================================================
--- devel/geany-plugins/files/Makefile.common
+++ devel/geany-plugins/files/Makefile.common
@@ -2,19 +2,27 @@
.include "${.CURDIR}/../../devel/geany-plugins/files/bsd.geany-plugins.mk"
+PORTREVISION= 1
+
MASTER_SITES= http://plugins.geany.org/geany-plugins/
DISTNAME= geany-plugins-${PORTVERSION}
DISTINFO_FILE= ${.CURDIR}/../../devel/geany-plugins/distinfo
-BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany
-LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-RUN_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany
-
GNU_CONFIGURE= yes
-USES+= gettext-tools gmake libtool pkgconfig tar:bzip2
-USE_GNOME+= cairo gdkpixbuf2 gtk20 intltool
+USES+= gettext-tools gmake gnome libtool pkgconfig tar:bzip2
+USE_GNOME+= intltool
+FLAVORS= gtk2 gtk3
+FLAVOR?= ${FLAVORS:[1]}
+
+gtk2_CONFLICTS_INSTALL= geany-plugin-${GEANY_PLUGIN}-gtk3
+
+gtk3_PKGNAMESUFFIX= -gtk3
+gtk3_CONFLICTS_INSTALL= geany-plugin-${GEANY_PLUGIN}
+
+BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany@${FLAVOR}
+RUN_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany@${FLAVOR}
+
# geany-plugins-l10n is not a plugin, thus special treatment
.if ${PORTNAME} == "geany-plugins-l10n"
GEANY_PLUGIN= po
@@ -22,7 +30,18 @@
USES+= localbase
.else
INSTALL_TARGET= install-strip
+USE_GNOME+= cairo gdkpixbuf2 ${FLAVOR}0
+
+.if ${FLAVOR} == gtk2
+LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+CONFIGURE_ARGS+= --disable-gtk3
+#PLIST_SUB+= GTK2="" GTK3="@comment "
+.elif ${FLAVOR} == gtk3
+CONFIGURE_ARGS+= --enable-gtk3
+#PLIST_SUB+= GTK2="@comment " GTK3=""
.endif
+.endif
GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,}
${GEANY_PLUGIN}_DIR?= ${GEANY_PLUGIN}
@@ -38,7 +57,7 @@
.if ${GEANY_UTIL:M${GEANY_PLUGIN}}
-LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib
+LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib@${FLAVOR}
CONFIGURE_ARGS+=--enable-utilslib
pre-build:
Index: devel/geany-plugins/files/bsd.geany-plugins.mk
===================================================================
--- devel/geany-plugins/files/bsd.geany-plugins.mk
+++ devel/geany-plugins/files/bsd.geany-plugins.mk
@@ -1,18 +1,21 @@
# $FreeBSD$
GEANY_VER= 1.33
+GEANY_PLUGINS_GTK2= debugger \
+ devhelp \
+ geanypy \
+ multiterm \
+ scope
+
GEANY_PLUGINS_ALL= addons \
autoclose \
automark \
codenav \
commander \
ctags \
- debugger \
defineformat \
- devhelp \
doc \
extrasel \
- geanypy \
gendoc \
geniuspaste \
git-changebar \
@@ -24,7 +27,6 @@
macro \
markdown \
miniscript \
- multiterm \
numberedbookmarks \
overview \
pairtaghighlighter \
@@ -33,7 +35,6 @@
pretty-printer \
projectorganizer \
prj \
- scope \
sendmail \
shiftcolumn \
spellcheck \
Index: devel/geany/Makefile
===================================================================
--- devel/geany/Makefile
+++ devel/geany/Makefile
@@ -3,7 +3,7 @@
PORTNAME= geany
PORTVERSION= 1.33
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel editors
MASTER_SITES= http://download.geany.org/ SF
@@ -13,15 +13,23 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
+FLAVORS= gtk2 gtk3
+FLAVOR?= ${FLAVORS:[1]}
-USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake libtool \
- localbase pathfix pkgconfig tar:bzip2
+gtk2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+gtk2_CONFLICTS_INSTALL= geany-gtk3
+
+gtk3_PKGNAMESUFFIX= -gtk3
+gtk3_CONFLICTS_INSTALL= geany
+
+USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake \
+ gnome libtool localbase pathfix pkgconfig tar:bzip2
+USE_GNOME= cairo intltool
+USE_LDCONFIG= yes
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_GNOME= cairo gtk20 intltool
-USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= VTE NLS DOCS
@@ -34,6 +42,16 @@
VTE_DESC= Embedded virtual terminal
VTE_CONFIGURE_ENABLE= vte
VTE_USE= GNOME=vte
+
+.if ${FLAVOR} == gtk2
+USE_GNOME+= gtk20
+CONFIGURE_ARGS+= --disable-gtk3
+PLIST_SUB+= GTK2="" GTK3="@comment "
+.elif ${FLAVOR} == gtk3
+USE_GNOME+= gtk30
+CONFIGURE_ARGS+= --enable-gtk3
+PLIST_SUB+= GTK2="@comment " GTK3=""
+.endif
post-patch-DOCS-off:
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
Index: devel/geany/pkg-plist
===================================================================
--- devel/geany/pkg-plist
+++ devel/geany/pkg-plist
@@ -153,8 +153,11 @@
%%DATADIR%%/filedefs/filetypes.xml
%%DATADIR%%/filedefs/filetypes.yaml
%%DATADIR%%/filedefs/filetypes.zephir
+%%GTK3%%%%DATADIR%%/geany-3.0.css
+%%GTK3%%%%DATADIR%%/geany-3.20.css
+%%GTK3%%%%DATADIR%%/geany.css
%%DATADIR%%/geany.glade
-%%DATADIR%%/geany.gtkrc
+%%GTK2%%%%DATADIR%%/geany.gtkrc
%%DATADIR%%/snippets.conf
%%DATADIR%%/tags/entities.html.tags
%%DATADIR%%/tags/std.pas.tags

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 20, 5:20 PM (5 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27766708
Default Alt Text
D18018.id50528.diff (9 KB)

Event Timeline