diff options
| -rw-r--r-- | x11-toolkits/gtkdatabox/Makefile | 32 | ||||
| -rw-r--r-- | x11-toolkits/gtkdatabox/distinfo | 6 | ||||
| -rw-r--r-- | x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c | 14 | ||||
| -rw-r--r-- | x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c | 14 | ||||
| -rw-r--r-- | x11-toolkits/gtkdatabox/pkg-plist | 14 |
5 files changed, 22 insertions, 58 deletions
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile index b662d7db9ac3..edd427468647 100644 --- a/x11-toolkits/gtkdatabox/Makefile +++ b/x11-toolkits/gtkdatabox/Makefile @@ -1,22 +1,20 @@ PORTNAME= gtkdatabox -PORTVERSION= 0.9.3.1 -PORTREVISION= 1 +DISTVERSION= 1.0.0 CATEGORIES= x11-toolkits -MASTER_SITES= SF -DIST_SUBDIR= gnome2 - -MAINTAINER= ports@FreeBSD.org -COMMENT= GTK+2 widget to display large amounts of numerical data +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1 +MAINTAINER= eduardo@FreeBSD.org +COMMENT= GTK+3 widget to display large amounts of numerical data WWW= https://sourceforge.net/projects/gtkdatabox/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gnome libtool pathfix pkgconfig -USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -27,29 +25,23 @@ INSTALL_TARGET= install-strip PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES GLADE OPTIONS_SUB= yes -GLADE_DESC= Enable libglade2 support -GLADE_USE= GNOME=libglade2 -GLADE_CONFIGURE_ENABLE= libglade -GLADEUI_DESC= Enable glade3 support -GLADEUI_LIB_DEPENDS= libgladeui-1.so:devel/glade3 -GLADEUI_CONFIGURE_ENABLE= glade +GLADE_LIB_DEPENDS= libgladeui-2.so:devel/glade +GLADE_CONFIGURE_ENABLE= glade post-patch: @${REINPLACE_CMD} -e \ '/^SUBDIR/s|examples||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|DOC_MODULE_VERSION = 1|#DOC_MODULE_VERSION = 1|' ${WRKSRC}/doc/Makefile.in .for dir in examples gtk @${REINPLACE_CMD} -e \ '/-O2/d ; \ /DISABLE_DEPRECATED/d' ${WRKSRC}/${dir}/Makefile.in .endfor -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} api ${STAGEDIR}${DOCSDIR}) - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11-toolkits/gtkdatabox/distinfo b/x11-toolkits/gtkdatabox/distinfo index 8f5c7d9b828b..4a4fe5db62e4 100644 --- a/x11-toolkits/gtkdatabox/distinfo +++ b/x11-toolkits/gtkdatabox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546007506 -SHA256 (gnome2/gtkdatabox-0.9.3.1.tar.gz) = d04938d969d5458bd0df1b4fa22f647fb2eeeef75555a71f967e6c039fb4bde5 -SIZE (gnome2/gtkdatabox-0.9.3.1.tar.gz) = 3680148 +TIMESTAMP = 1680789108 +SHA256 (gtkdatabox-1.0.0.tar.gz) = 8bee70206494a422ecfec9a88d32d914c50bb7a0c0e8fedc4512f5154aa9d3e3 +SIZE (gtkdatabox-1.0.0.tar.gz) = 520992 diff --git a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c deleted file mode 100644 index f39e86aaf6dc..000000000000 --- a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk/gtkdatabox.c.orig 2018-11-02 17:08:28 UTC -+++ gtk/gtkdatabox.c -@@ -23,6 +23,11 @@ - #include <gtk/gtk.h> - #include <math.h> - -+#include <sys/param.h> -+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - - static gint gtk_databox_button_press (GtkWidget * widget, - GdkEventButton * event); diff --git a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c deleted file mode 100644 index f00bda605f88..000000000000 --- a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk/gtkdatabox_ruler.c.orig 2018-06-29 20:20:11 UTC -+++ gtk/gtkdatabox_ruler.c -@@ -34,6 +34,11 @@ - - #include <string.h> - -+#include <sys/param.h> -+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - #define RULER_SIZE 14 - - #define ROUND(x) ((int) ((x) + 0.5)) diff --git a/x11-toolkits/gtkdatabox/pkg-plist b/x11-toolkits/gtkdatabox/pkg-plist index efe14d4b68be..86d78ed6fd8d 100644 --- a/x11-toolkits/gtkdatabox/pkg-plist +++ b/x11-toolkits/gtkdatabox/pkg-plist @@ -14,13 +14,13 @@ include/gtkdatabox/gtkdatabox_scale.h include/gtkdatabox/gtkdatabox_typedefs.h include/gtkdatabox/gtkdatabox_xyc_graph.h include/gtkdatabox/gtkdatabox_xyyc_graph.h -%%GLADEUI%%lib/glade3/modules/libgladedatabox.a -%%GLADEUI%%lib/glade3/modules/libgladedatabox.so -%%GLADE%%lib/libglade/2.0/libdatabox.a -%%GLADE%%lib/libglade/2.0/libdatabox.so -lib/libgtkdatabox-0.9.3.so.1 -lib/libgtkdatabox-0.9.3.so.1.0.0 +%%GLADE%%lib/glade/modules/libgladedatabox.a +%%GLADE%%lib/glade/modules/libgladedatabox.so lib/libgtkdatabox.a lib/libgtkdatabox.so +lib/libgtkdatabox.so.1 +lib/libgtkdatabox.so.1.0.0 libdata/pkgconfig/gtkdatabox.pc -%%GLADEUI%%share/glade3/catalogs/gtkdatabox.xml +%%GLADE%%share/glade/catalogs/gtkdatabox.xml +%%GLADE%%share/icons/hicolor/scalable/apps/widget-gladedatabox-gtk_databox.svg +%%GLADE%%share/icons/hicolor/scalable/apps/widget-gladedatabox-gtk_databox_ruler.svg |