aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/glabels/Makefile7
-rw-r--r--deskutils/glabels/pkg-comment1
-rw-r--r--graphics/gthumb2/Makefile5
-rw-r--r--graphics/gthumb2/files/patch-configure178
-rw-r--r--graphics/gthumb2/files/patch-libgthumb_print-callbacks.c52
-rw-r--r--graphics/gthumb2/pkg-comment1
-rw-r--r--math/gretl/Makefile3
-rw-r--r--misc/gretl/Makefile3
-rw-r--r--www/screem-devel/Makefile4
-rw-r--r--www/screem-devel/pkg-comment1
-rw-r--r--www/screem/Makefile4
-rw-r--r--www/screem/pkg-comment1
12 files changed, 12 insertions, 248 deletions
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 68cdf55449c6..2ae029bd06eb 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -12,13 +12,12 @@ CATEGORIES= deskutils
MASTER_SITES= http://snaught.com/glabels/source/
MAINTAINER= martin.klaffenboeck@gmx.at
+COMMENT= A programm to create labels and business cards
-LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+ gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-BROKEN= "Requires update to work with libgnomeprint-2-2"
USE_GNOMENG= yes
USE_GNOME= gnomehack gnomeprefix gnomelibs
USE_X_PREFIX= yes
diff --git a/deskutils/glabels/pkg-comment b/deskutils/glabels/pkg-comment
deleted file mode 100644
index 3e07a7b36c04..000000000000
--- a/deskutils/glabels/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A programm to create labels and business cards
diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index d75a8ffd3a83..719a69ac5e0f 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -7,16 +7,17 @@
PORTNAME= gthumb2
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gthumb
DISTNAME= gthumb-${PORTVERSION}
MAINTAINER= verbophobe@hotmail.com
+COMMENT= An image viewer and browser for the GNOME 2 environment
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
- gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+ gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/gthumb2/files/patch-configure b/graphics/gthumb2/files/patch-configure
deleted file mode 100644
index 13092cd574c0..000000000000
--- a/graphics/gthumb2/files/patch-configure
+++ /dev/null
@@ -1,178 +0,0 @@
---- configure.orig Sat Feb 8 16:36:39 2003
-+++ configure Sat Feb 8 16:37:10 2003
-@@ -7666,8 +7666,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0" >&5
- echo $ECHO_N "checking for \
- glib-2.0 \
-@@ -7680,8 +7680,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "\
-@@ -7695,8 +7695,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -7715,8 +7715,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0"`
- echo "$as_me:$LINENO: result: $GTHUMB_CFLAGS" >&5
- echo "${ECHO_T}$GTHUMB_CFLAGS" >&6
-@@ -7734,8 +7734,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0"`
- echo "$as_me:$LINENO: result: $GTHUMB_LIBS" >&5
- echo "${ECHO_T}$GTHUMB_LIBS" >&6
-@@ -7755,8 +7755,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0"`
- echo $GTHUMB_PKG_ERRORS
- fi
-@@ -7783,8 +7783,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
- echo "$as_me: error: Library requirements (\
- glib-2.0 \
-@@ -7797,8 +7797,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -7871,8 +7871,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0" >&5
-@@ -7887,8 +7887,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0... $ECHO_C" >&6
-@@ -7904,8 +7904,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0" ; then
-@@ -7926,8 +7926,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0"`
-@@ -7947,8 +7947,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0"`
-@@ -7970,8 +7970,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0"`
-@@ -8000,8 +8000,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-@@ -8016,8 +8016,8 @@
- gnome-vfs-module-2.0 \
- libxml-2.0 \
- libglade-2.0 \
-- libgnomeprint-2.0 \
-- libgnomeprintui-2.0 \
-+ libgnomeprint-2.2 \
-+ libgnomeprintui-2.2 \
- bonobo-activation-2.0 \
- libbonobo-2.0 \
- libbonoboui-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
diff --git a/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c b/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c
deleted file mode 100644
index d7aab40d9e73..000000000000
--- a/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- libgthumb/print-callbacks.c.ori Fri Jan 31 18:49:46 2003
-+++ libgthumb/print-callbacks.c Fri Jan 31 18:51:39 2003
-@@ -25,11 +25,8 @@
-
- #include <libgnome/libgnome.h>
- #include <libgnomeprint/gnome-print.h>
--#include <libgnomeprint/gnome-print-master.h>
- #include <libgnomeprintui/gnome-print-preview.h>
--#include <libgnomeprintui/gnome-print-master-preview.h>
- #include <libgnomeprintui/gnome-print-dialog.h>
--#include <libgnomeprintui/gnome-printer-dialog.h>
- #include <libgnomeprintui/gnome-print-paper-selector.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
-@@ -68,7 +65,6 @@
- double paper_bmargin;
-
- GnomePrintConfig *config;
-- GnomePrintMaster *gpm;
-
- gboolean print_comment;
- gboolean portrait;
-@@ -117,8 +113,6 @@
- pi->ref_count--;
-
- if (pi->ref_count == 0) {
-- if (pi->gpm != NULL)
-- g_object_unref (pi->gpm);
- gnome_print_config_unref (pi->config);
- g_object_unref (pi->pixbuf);
- g_object_unref (pi->font_comment);
-@@ -727,11 +721,7 @@
-
- /* Print !! */
-
-- pi->gpm = gnome_print_master_new_from_config (pi->config);
-- gp_ctx = gnome_print_master_get_context (pi->gpm);
- print_image (gp_ctx, pi, FALSE);
-- gnome_print_master_close (pi->gpm);
-- gnome_print_master_print (pi->gpm);
- print_info_unref (pi);
- }
-
-@@ -938,7 +928,7 @@
- notebook = glade_xml_get_widget (data->gui, "notebook");
-
- gtk_box_pack_start (GTK_BOX (printer_vbox),
-- gnome_printer_selection_new (pi->config),
-+ gtk_label_new("Sorry, printing is currently broken"),
- FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (paper_vbox),
- gnome_paper_selector_new (pi->config), /*FIXME*/
diff --git a/graphics/gthumb2/pkg-comment b/graphics/gthumb2/pkg-comment
deleted file mode 100644
index a4be5a424edc..000000000000
--- a/graphics/gthumb2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An image viewer and browser for the GNOME 2 environment
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 52625e6e3990..65c416d66945 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -38,8 +38,7 @@ MAN1= gretl.1 gretl-config.1
CONFIGURE_ARGS+= --without-gnome
PLIST_SUB+= GNOME2:="@comment " DATADIR="share"
.else
-BROKEN= "Needs to be updated for libgnomeprint-2.2"
-LIB_DEPENDS+= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+LIB_DEPENDS+= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
USE_GNOME= gnomeprefix
PLIST_SUB+= GNOME2:="" DATADIR="share/gnome"
diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 52625e6e3990..65c416d66945 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -38,8 +38,7 @@ MAN1= gretl.1 gretl-config.1
CONFIGURE_ARGS+= --without-gnome
PLIST_SUB+= GNOME2:="@comment " DATADIR="share"
.else
-BROKEN= "Needs to be updated for libgnomeprint-2.2"
-LIB_DEPENDS+= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+LIB_DEPENDS+= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
USE_GNOME= gnomeprefix
PLIST_SUB+= GNOME2:="" DATADIR="share/gnome"
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 7452d3516f4b..f35e25b73fff 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -15,14 +15,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= coop9211@uidaho.edu
+COMMENT= Nice GNOME/GTK-based HTML editor
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
- gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+ gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
neon.23:${PORTSDIR}/www/neon
-BROKEN= "Requires update to work with libgnomeprint-2-2"
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/www/screem-devel/pkg-comment b/www/screem-devel/pkg-comment
deleted file mode 100644
index 3c676fa0da22..000000000000
--- a/www/screem-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nice GNOME/GTK-based HTML editor
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 7452d3516f4b..f35e25b73fff 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -15,14 +15,14 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= coop9211@uidaho.edu
+COMMENT= Nice GNOME/GTK-based HTML editor
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
- gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+ gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
neon.23:${PORTSDIR}/www/neon
-BROKEN= "Requires update to work with libgnomeprint-2-2"
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/www/screem/pkg-comment b/www/screem/pkg-comment
deleted file mode 100644
index 3c676fa0da22..000000000000
--- a/www/screem/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nice GNOME/GTK-based HTML editor