diff --git a/doc/CHANGES-2012 b/doc/CHANGES-2012 index 21af32f0532be..812b99bc30d88 100644 --- a/doc/CHANGES-2012 +++ b/doc/CHANGES-2012 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2012,v 1.3331 2012/10/20 14:50:35 darcy Exp $ +$NetBSD: CHANGES-2012,v 1.3332 2012/10/20 15:43:08 wiz Exp $ Changes to the packages collection and infrastructure in 2012: @@ -5160,3 +5160,6 @@ Changes to the packages collection and infrastructure in 2012: Updated x11/xterm to 284 [wiz 2012-10-20] Updated security/p5-Crypt-OpenSSL-DSA to 0.14 [wen 2012-10-20] Added audio/freeswitch-music version 1.0.8 [darcy 2012-10-20] + Removed graphics/p5-Gdk-Imlib [wiz 2012-10-20] + Removed graphics/p5-Gdk-Pixbuf [wiz 2012-10-20] + Removed x11/p5-gtk [wiz 2012-10-20] diff --git a/graphics/Makefile b/graphics/Makefile index df6a6063158ed..17263053afe87 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.637 2012/10/16 22:10:58 minskim Exp $ +# $NetBSD: Makefile,v 1.638 2012/10/20 15:43:08 wiz Exp $ # COMMENT= Graphics tools and libraries @@ -324,8 +324,6 @@ SUBDIR+= p5-GDGraph SUBDIR+= p5-GDGraph-boxplot SUBDIR+= p5-GDTextUtil SUBDIR+= p5-GIFgraph -SUBDIR+= p5-Gdk-Imlib -SUBDIR+= p5-Gdk-Pixbuf SUBDIR+= p5-Gnome2-Canvas SUBDIR+= p5-GraphViz SUBDIR+= p5-GraphViz2 diff --git a/graphics/p5-Gdk-Imlib/DESCR b/graphics/p5-Gdk-Imlib/DESCR deleted file mode 100644 index eb3a9a2f420bc..0000000000000 --- a/graphics/p5-Gdk-Imlib/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -The Gtk module allows Perl access to the Gtk+ graphical user interface -library. You can find more information about Gtk+ on http://www.gtk.org. -The Perl binding tries to follow the C interface as much as possible, -providing at the same time a fully object-oriented interface and -Perl-style calling conventions. - -This is the Gtk::Gdk::Imlib extension of the Gtk module. diff --git a/graphics/p5-Gdk-Imlib/Makefile b/graphics/p5-Gdk-Imlib/Makefile deleted file mode 100644 index 21e498135defc..0000000000000 --- a/graphics/p5-Gdk-Imlib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2012/10/06 14:11:10 asau Exp $ -# - -MAKE_JOBS_SAFE= no - -.include "../../x11/p5-gtk/Makefile.common" - -PKGNAME= p5-Gdk-Imlib-${GTKPERL_VERSION} -PKGREVISION= 15 - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Perl bindings for Imlib - -PERL5_PACKLIST= auto/Gtk/Gdk/ImlibImage/.packlist -SUBPACKAGE= GdkImlib - -.include "../../graphics/imlib-gtk/buildlink3.mk" -.include "../../x11/p5-gtk/Makefile.subpackage" diff --git a/graphics/p5-Gdk-Pixbuf/DESCR b/graphics/p5-Gdk-Pixbuf/DESCR deleted file mode 100644 index a83fa20832635..0000000000000 --- a/graphics/p5-Gdk-Pixbuf/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -The Gtk module allows Perl access to the Gtk+ graphical user interface -library. You can find more information about Gtk+ on http://www.gtk.org. -The Perl binding tries to follow the C interface as much as possible, -providing at the same time a fully object-oriented interface and -Perl-style calling conventions. - -This is the Gtk::Gdk::Pixbuf extension of the Gtk module. diff --git a/graphics/p5-Gdk-Pixbuf/Makefile b/graphics/p5-Gdk-Pixbuf/Makefile deleted file mode 100644 index aeff6c03cfa66..0000000000000 --- a/graphics/p5-Gdk-Pixbuf/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.31 2012/10/06 14:11:11 asau Exp $ -# - -MAKE_JOBS_SAFE= no - -.include "../../x11/p5-gtk/Makefile.common" - -PKGNAME= p5-Gdk-Pixbuf-${GTKPERL_VERSION} -PKGREVISION= 22 - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Perl5 Gtk::Gdk::Pixbuf - -PERL5_PACKLIST= auto/Gtk/Gdk/Pixbuf/.packlist -SUBPACKAGE= GdkPixbuf - -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.include "../../x11/p5-gtk/Makefile.subpackage" diff --git a/x11/Makefile b/x11/Makefile index 5f6ba35f45ea0..0308b315e45e1 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.664 2012/10/18 09:43:01 wiz Exp $ +# $NetBSD: Makefile,v 1.665 2012/10/20 15:43:08 wiz Exp $ # COMMENT= Packages to support the X window system @@ -280,7 +280,6 @@ SUBDIR+= p5-Tk SUBDIR+= p5-Wx SUBDIR+= p5-Wx-Perl-ProcessStream SUBDIR+= p5-X11-Protocol -SUBDIR+= p5-gtk SUBDIR+= p5-gtk2 SUBDIR+= paragui SUBDIR+= pixman diff --git a/x11/p5-gtk/DESCR b/x11/p5-gtk/DESCR deleted file mode 100644 index b137ec0f3afa5..0000000000000 --- a/x11/p5-gtk/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -The Gtk module allows Perl access to the Gtk+ graphical user interface -library. You can find more information about Gtk+ on http://www.gtk.org. -The Perl binding tries to follow the C interface as much as possible, -providing at the same time a fully object-oriented interface and -Perl-style calling conventions. diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile deleted file mode 100644 index 76b7e4559a3af..0000000000000 --- a/x11/p5-gtk/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: Makefile,v 1.43 2012/10/03 21:59:09 wiz Exp $ -# - -PKG_DESTDIR_SUPPORT= user-destdir - -.include "Makefile.common" - -PKGNAME= p5-gtk-${GTKPERL_VERSION} -PKGREVISION= 11 -SVR4_PKGNAME= p5gtk - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Perl bindings for GTK+ - -MAKE_JOBS_SAFE= no - -WRKSRC= ${WRKDIR}/${DISTNAME}/Gtk -MAKE_PARAMS= INSTALLMAN3DIR=${PREFIX}/${PKGMANDIR}/man3 -PERL5_PACKLIST= auto/Gtk/.packlist - -REPLACE_PERL+= ../tools/* - -.include "../../lang/perl5/module.mk" -.include "../../x11/gtk/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-gtk/Makefile.common b/x11/p5-gtk/Makefile.common deleted file mode 100644 index 6fa1b3a371adc..0000000000000 --- a/x11/p5-gtk/Makefile.common +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: Makefile.common,v 1.6 2007/01/30 21:27:02 joerg Exp $ -# -# common things for p5-gtk based packages - -GTKPERL_VERSION= 0.7009 -DISTNAME= Gtk-Perl-${GTKPERL_VERSION} - -CATEGORIES= x11 perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Gtk/} \ - ftp://ftp.gtk.org/pub/gtk/perl/ - -BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser -BUILD_DEPENDS+= p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer diff --git a/x11/p5-gtk/Makefile.subpackage b/x11/p5-gtk/Makefile.subpackage deleted file mode 100644 index aa1bfcb0e8b62..0000000000000 --- a/x11/p5-gtk/Makefile.subpackage +++ /dev/null @@ -1,31 +0,0 @@ -# $NetBSD: Makefile.subpackage,v 1.12 2006/09/09 02:46:09 obache Exp $ -# -# makefile fragment for p5-gtk sub-packages. you need to -# set SUBPACKAGE before including this. - -GTKDIR= ${WRKDIR}/${DISTNAME}/Gtk - -DISTINFO_FILE= ${.CURDIR}/../../x11/p5-gtk/distinfo -PATCHDIR= ${.CURDIR}/../../x11/p5-gtk/patches - -DEPENDS+= p5-gtk-[0-9]*:../../x11/p5-gtk - -WRKSRC= ${WRKDIR}/${DISTNAME}/${SUBPACKAGE} - -# Change Makefile.PL to generate .3 manpages instead .3pm. -SUBST_CLASSES+= 3pm -SUBST_STAGE.3pm= pre-configure -SUBST_FILES.3pm= Makefile.PL -SUBST_SED.3pm= -e "s,\.3pm,\.3,g" - -.PHONY: gtk-configure -pre-configure: gtk-configure -gtk-configure: - cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL - cd ${GTKDIR} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} -f ${MAKE_FILE} ${BUILD_TARGET} - -.include "../../lang/perl5/module.mk" -.include "../../x11/gtk/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-gtk/distinfo b/x11/p5-gtk/distinfo deleted file mode 100644 index c2bf56179b5e9..0000000000000 --- a/x11/p5-gtk/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.9 2012/10/15 13:05:54 wiz Exp $ - -SHA1 (Gtk-Perl-0.7009.tar.gz) = a48680c4db2aef82247061265784383df320c221 -RMD160 (Gtk-Perl-0.7009.tar.gz) = 98449575c3e3a605d324c878cc5dee504cb7d0b6 -Size (Gtk-Perl-0.7009.tar.gz) = 447432 bytes -SHA1 (patch-aa) = c15288af428dde6c97996c5f8e2904107062dca8 -SHA1 (patch-ab) = 9aa6b2ef31267a4da557bf7c9bc1136de8097e0a -SHA1 (patch-gtk-0.99.typemap) = e5f24f9947748b729107c0b3f909a6ae06cd6485 diff --git a/x11/p5-gtk/patches/patch-aa b/x11/p5-gtk/patches/patch-aa deleted file mode 100644 index 6241730f249de..0000000000000 --- a/x11/p5-gtk/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/09/07 18:17:04 seb Exp $ - ---- ../Gtk/Makefile.PL.orig Sat May 26 12:08:38 2001 -+++ ../Gtk/Makefile.PL -@@ -160,11 +160,11 @@ - 'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" }, - 'OPTIMIZE' => '-O2 -g', - 'MAN3PODS' => { -- 'cookbook.pod' => '$(INST_MAN3DIR)/Gtk::cookbook.3pm', -- 'Gtk.pm' => '$(INST_MAN3DIR)/Gtk.3pm', -- 'objects.pod' => '$(INST_MAN3DIR)/Gtk::objects.3pm', -- 'GtkCListModel.pm' => '$(INST_MAN3DIR)/Gtk::CListModel.3pm', -- 'build/perl-gtk-ref.pod' => '$(INST_MAN3DIR)/Gtk::reference.3pm', -+ 'cookbook.pod' => '$(INST_MAN3DIR)/Gtk::cookbook.3', -+ 'Gtk.pm' => '$(INST_MAN3DIR)/Gtk.3', -+ 'objects.pod' => '$(INST_MAN3DIR)/Gtk::objects.3', -+ 'GtkCListModel.pm' => '$(INST_MAN3DIR)/Gtk::CListModel.3', -+ 'build/perl-gtk-ref.pod' => '$(INST_MAN3DIR)/Gtk::reference.3', - }, - $gtk->get_makefile_vars, - ); diff --git a/x11/p5-gtk/patches/patch-ab b/x11/p5-gtk/patches/patch-ab deleted file mode 100644 index e645e27842450..0000000000000 --- a/x11/p5-gtk/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/11/08 13:40:33 obache Exp $ - ---- ../GdkPixbuf/Makefile.PL.orig 2003-06-17 09:47:56.000000000 +0000 -+++ ../GdkPixbuf/Makefile.PL -@@ -9,8 +9,12 @@ $gpb = new ExtUtils::Depends('Gtk::Gdk:: - - mkdir('build', 0777); - --$gpb->set_inc (`gdk-pixbuf-config --cflags`); --$gpb->set_libs (`gdk-pixbuf-config --libs`); -+$libs = `gdk-pixbuf-config --libs`; -+$inc = `gdk-pixbuf-config --cflags`; -+$libs =~ s/\s+/ /g; -+$inc =~ s/\s+/ /g; -+$gpb->set_inc ($inc); -+$gpb->set_libs ($libs); - - $gpb->add_typemaps (cwd() . '/pkg.typemap', cwd().'/build/GdkPixbufTypemap'); - $gpb->add_headers (qw( )); diff --git a/x11/p5-gtk/patches/patch-gtk-0.99.typemap b/x11/p5-gtk/patches/patch-gtk-0.99.typemap deleted file mode 100644 index 3694ba3195b71..0000000000000 --- a/x11/p5-gtk/patches/patch-gtk-0.99.typemap +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-gtk-0.99.typemap,v 1.2 2012/10/15 13:05:54 wiz Exp $ - -Fix build with perl-5.16. -Based on -http://blog.truecrux.org/post/xxxi - ---- gtk-0.99.typemap.orig 2001-05-07 10:13:45.000000000 +0000 -+++ gtk-0.99.typemap -@@ -62,7 +62,7 @@ T_GtkPTROBJ - } while(0) - - T_GtkPTROBJOrNULL -- $var = SvTRUE($arg) ? Cast$type(SvGtkObjectRef($arg, \"" . ($foo=$ntype,$foo=~s/_OrNULL//,$foo). "\")) : 0 -+ $var = SvTRUE($arg) ? Cast$type(SvGtkObjectRef($arg, \"" . (our $foo=$ntype,$foo=~s/_OrNULL//,$foo). "\")) : 0 - - T_GtkPTROBJUp - $var = Cast$type(SvGtkObjectRef($arg, \"${ntype}\")) -@@ -95,14 +95,14 @@ T_SimpleVal - do { - if (!$arg || !SvOK($arg)) - croak(\"$var is not of type ${ntype}\"); -- $var = Sv" . ($foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo) . "($arg); -+ $var = Sv" . (our $foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo) . "($arg); - } while (0) - - T_SimpleValOrNULL -- $var = ($arg && SvOK($arg)) ? Sv" . ($foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo=~s/_OrNULL$//, $foo) . "($arg) : 0 -+ $var = ($arg && SvOK($arg)) ? Sv" . (our $foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo=~s/_OrNULL$//, $foo) . "($arg) : 0 - - T_SimplePtr -- $var = Sv" . ($foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo) . "($arg,0) -+ $var = Sv" . (our $foo=$ntype, $foo=~s/://g, $foo=~s/^GtkGdk/Gdk/, $foo) . "($arg,0) - - OUTPUT -