diff options
26 files changed, 113 insertions, 206 deletions
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile index d47e917..a3dabf5 100644 --- a/x11-toolkits/p5-GdkImlib/Makefile +++ b/x11-toolkits/p5-GdkImlib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= GdkImlib -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk diff --git a/x11-toolkits/p5-GdkImlib/distinfo b/x11-toolkits/p5-GdkImlib/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-GdkImlib/distinfo +++ b/x11-toolkits/p5-GdkImlib/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-GdkImlib/files/patch-Makefile.PL b/x11-toolkits/p5-GdkImlib/files/patch-Makefile.PL index bef1055..c26dd0a 100644 --- a/x11-toolkits/p5-GdkImlib/files/patch-Makefile.PL +++ b/x11-toolkits/p5-GdkImlib/files/patch-Makefile.PL @@ -1,19 +1,9 @@ ---- Makefile.PL.orig Fri Oct 13 00:20:57 2000 -+++ Makefile.PL Mon Oct 30 03:51:44 2000 -@@ -1,5 +1,4 @@ +--- Makefile.PL.orig Mon Mar 12 03:29:15 2001 ++++ Makefile.PL Mon Mar 12 03:29:27 2001 +@@ -1,6 +1,5 @@ use ExtUtils::MakeMaker; --use blib '..'; - use Gtk::Install::Files; use Cwd; +-use blib '../Gtk'; require '../Depends.pm'; -@@ -27,8 +26,8 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - - push(@defines, @Gtk::Install::Files::defines); + $imlib = new ExtUtils::Depends ('Gtk::Gdk::ImlibImage', 'Gtk'); diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile index a17d1ae..3d46f3b 100644 --- a/x11-toolkits/p5-GdkPixbuf/Makefile +++ b/x11-toolkits/p5-GdkPixbuf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= GdkPixbuf -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -18,7 +18,6 @@ MAINTAINER= vanilla@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -USE_GNOME= yes PERL_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} diff --git a/x11-toolkits/p5-GdkPixbuf/distinfo b/x11-toolkits/p5-GdkPixbuf/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-GdkPixbuf/distinfo +++ b/x11-toolkits/p5-GdkPixbuf/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-GdkPixbuf/files/patch-Makefile.PL b/x11-toolkits/p5-GdkPixbuf/files/patch-Makefile.PL index 2092244..bcd0b25 100644 --- a/x11-toolkits/p5-GdkPixbuf/files/patch-Makefile.PL +++ b/x11-toolkits/p5-GdkPixbuf/files/patch-Makefile.PL @@ -1,20 +1,8 @@ ---- Makefile.PL.orig Tue Jun 20 18:37:48 2000 -+++ Makefile.PL Mon Oct 30 03:53:05 2000 -@@ -1,6 +1,5 @@ +--- Makefile.PL.orig Mon Mar 12 05:04:53 2001 ++++ Makefile.PL Mon Mar 12 05:05:00 2001 +@@ -1,5 +1,4 @@ use ExtUtils::MakeMaker; - use File::Basename; --use blib '..'; - use Gtk::Install::Files; +-use blib '../Gtk'; use Cwd; require '../Depends.pm'; -@@ -29,8 +28,8 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - - push(@defines, @Gtk::Install::Files::defines); + require '../tools/gendefs.pl'; diff --git a/x11-toolkits/p5-GdkPixbuf/pkg-plist b/x11-toolkits/p5-GdkPixbuf/pkg-plist index 6c53758..a18b652 100644 --- a/x11-toolkits/p5-GdkPixbuf/pkg-plist +++ b/x11-toolkits/p5-GdkPixbuf/pkg-plist @@ -1,8 +1,8 @@ -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/GdkPixbufDefs.h -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/PerlGdkPixbufInt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/Files.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufDefs.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/GdkPixbufTypemap +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/PerlGdkPixbufInt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install/pkg.typemap lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/.packlist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.bs diff --git a/x11-toolkits/p5-Glade/Makefile b/x11-toolkits/p5-Glade/Makefile index 5e0de47..12d0f50 100644 --- a/x11-toolkits/p5-Glade/Makefile +++ b/x11-toolkits/p5-Glade/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Glade -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -15,7 +15,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk +BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade USE_GNOME= yes diff --git a/x11-toolkits/p5-Glade/distinfo b/x11-toolkits/p5-Glade/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-Glade/distinfo +++ b/x11-toolkits/p5-Glade/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-Glade/files/patch-Makefile.PL b/x11-toolkits/p5-Glade/files/patch-Makefile.PL index d1b8c82..88004cc 100644 --- a/x11-toolkits/p5-Glade/files/patch-Makefile.PL +++ b/x11-toolkits/p5-Glade/files/patch-Makefile.PL @@ -1,33 +1,8 @@ ---- Makefile.PL.orig Tue Jun 20 18:35:46 2000 -+++ Makefile.PL Mon Oct 30 03:49:43 2000 -@@ -1,6 +1,5 @@ +--- Makefile.PL.orig Mon Mar 12 06:32:57 2001 ++++ Makefile.PL Mon Mar 12 14:26:55 2001 +@@ -1,5 +1,4 @@ use ExtUtils::MakeMaker; - use File::Basename; --use blib '..'; - use Gtk::Install::Files; +-use blib '../Gtk'; use Cwd; require '../Depends.pm'; -@@ -31,12 +30,12 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - - push(@defines, @Gtk::Install::Files::defines); --push(@defines, '-I../build', '-Ibuild', '-I.', '-I../Gtk'); -+push(@defines, '-I../build', '-Ibuild', '-I.', '-I'.$Gtk::Install::Files::CORE); - - $pm->{'GladeXML.pm'} = '$(INST_ARCHLIBDIR)/GladeXML.pm'; - $pm->{'build/GtkGladeXMLTypes.pm'} = '$(INST_ARCHLIBDIR)/GladeXML/Types.pm'; -@@ -105,7 +104,6 @@ - 'INC' => $inc, - 'LIBS' => [$libs], - 'OBJECT' => $object, -- 'OPTIMIZE' => '-O2 -g', - 'clean' => {FILES => join(' ', @clean) }, - #'LDFROM' => $ldfrom, - 'depend' => $depend, + require '../tools/gendefs.pl'; diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile index 5e0de47..12d0f50 100644 --- a/x11-toolkits/p5-Glade2/Makefile +++ b/x11-toolkits/p5-Glade2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Glade -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -15,7 +15,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk +BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade USE_GNOME= yes diff --git a/x11-toolkits/p5-Glade2/distinfo b/x11-toolkits/p5-Glade2/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-Glade2/distinfo +++ b/x11-toolkits/p5-Glade2/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-Glade2/files/patch-Makefile.PL b/x11-toolkits/p5-Glade2/files/patch-Makefile.PL index d1b8c82..88004cc 100644 --- a/x11-toolkits/p5-Glade2/files/patch-Makefile.PL +++ b/x11-toolkits/p5-Glade2/files/patch-Makefile.PL @@ -1,33 +1,8 @@ ---- Makefile.PL.orig Tue Jun 20 18:35:46 2000 -+++ Makefile.PL Mon Oct 30 03:49:43 2000 -@@ -1,6 +1,5 @@ +--- Makefile.PL.orig Mon Mar 12 06:32:57 2001 ++++ Makefile.PL Mon Mar 12 14:26:55 2001 +@@ -1,5 +1,4 @@ use ExtUtils::MakeMaker; - use File::Basename; --use blib '..'; - use Gtk::Install::Files; +-use blib '../Gtk'; use Cwd; require '../Depends.pm'; -@@ -31,12 +30,12 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - - push(@defines, @Gtk::Install::Files::defines); --push(@defines, '-I../build', '-Ibuild', '-I.', '-I../Gtk'); -+push(@defines, '-I../build', '-Ibuild', '-I.', '-I'.$Gtk::Install::Files::CORE); - - $pm->{'GladeXML.pm'} = '$(INST_ARCHLIBDIR)/GladeXML.pm'; - $pm->{'build/GtkGladeXMLTypes.pm'} = '$(INST_ARCHLIBDIR)/GladeXML/Types.pm'; -@@ -105,7 +104,6 @@ - 'INC' => $inc, - 'LIBS' => [$libs], - 'OBJECT' => $object, -- 'OPTIMIZE' => '-O2 -g', - 'clean' => {FILES => join(' ', @clean) }, - #'LDFROM' => $ldfrom, - 'depend' => $depend, + require '../tools/gendefs.pl'; diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile index 4022031..a0d2743 100644 --- a/x11-toolkits/p5-Gnome/Makefile +++ b/x11-toolkits/p5-Gnome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Gnome -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -19,10 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk USE_PERL5= yes USE_GNOME= yes +PERL_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} -do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ - --with-panel CC="${CC}" CCFLAGS="${CFLAGS}" - .include <bsd.port.mk> diff --git a/x11-toolkits/p5-Gnome/distinfo b/x11-toolkits/p5-Gnome/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-Gnome/distinfo +++ b/x11-toolkits/p5-Gnome/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-Gnome/files/patch-Makefile.PL b/x11-toolkits/p5-Gnome/files/patch-Makefile.PL index ee3779a..760ec07 100644 --- a/x11-toolkits/p5-Gnome/files/patch-Makefile.PL +++ b/x11-toolkits/p5-Gnome/files/patch-Makefile.PL @@ -1,35 +1,17 @@ ---- Makefile.PL.orig Tue Jun 20 18:36:15 2000 -+++ Makefile.PL Mon Oct 30 03:52:25 2000 -@@ -1,7 +1,5 @@ +--- Makefile.PL.orig Mon Mar 12 06:06:22 2001 ++++ Makefile.PL Mon Mar 12 06:08:32 2001 +@@ -1,6 +1,4 @@ use ExtUtils::MakeMaker; - use File::Basename; --use blib '..'; +-use blib '../Gtk'; -use blib '../GdkImlib'; - use Gtk::Install::Files; - use Gtk::Gdk::ImlibImage::Install::Files; use Cwd; -@@ -46,12 +44,12 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - foreach (@Gtk::Gdk::ImlibImage::Install::Files::typemaps) { -- print "Add typemap: $Gtk::Gdk::ImlibImage::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Gdk::ImlibImage::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Gdk::ImlibImage::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Gdk::ImlibImage::Install::Files::CORE . $_); - } - push(@defines, @Gtk::Install::Files::defines, @Gtk::Gdk::ImlibImage::Install::Files::defines); - #push(@defines, '-I../build', '-Ibuild', '-I.', '-I../Gtk'); -@@ -127,7 +125,6 @@ - 'LIBS' => [$libs], - 'OBJECT' => $object, - 'clean' => {FILES => join(' ', @clean) }, + require '../Depends.pm'; + require '../tools/gendefs.pl'; +@@ -88,7 +86,6 @@ + 'XSOPT' => '-noversioncheck', + 'DEFINE' => join(' ',@defines), + 'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" }, - 'OPTIMIZE' => '-O2 -g', - #'LDFROM' => $ldfrom, 'depend' => $depend, + $gnome->get_makefile_vars, ); diff --git a/x11-toolkits/p5-Gnome/pkg-plist b/x11-toolkits/p5-Gnome/pkg-plist index 08066ed..cbc7751 100644 --- a/x11-toolkits/p5-Gnome/pkg-plist +++ b/x11-toolkits/p5-Gnome/pkg-plist @@ -1,10 +1,11 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome.pm -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Types.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/Files.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeDefs.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypemap +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypes.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/PerlGnomeInt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/pkg.typemap +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Types.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/.packlist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.bs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.so diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile index 1eb3d75..0d5295b 100644 --- a/x11-toolkits/p5-Gtk/Makefile +++ b/x11-toolkits/p5-Gtk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Gtk -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -17,8 +17,9 @@ MAINTAINER= vanilla@FreeBSD.org USE_GTK= yes PERL_CONFIGURE= yes +CONFIGURE_ARGS= --without-guessing --lazy-load -MAN3= Gtk::GtkColorSelectButton.3 -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3= cookbook.3pm .include <bsd.port.mk> diff --git a/x11-toolkits/p5-Gtk/distinfo b/x11-toolkits/p5-Gtk/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-Gtk/distinfo +++ b/x11-toolkits/p5-Gtk/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL b/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL new file mode 100644 index 0000000..026b558 --- /dev/null +++ b/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL @@ -0,0 +1,30 @@ +--- Gtk/Makefile.PL.orig Mon Mar 12 02:44:49 2001 ++++ Gtk/Makefile.PL Mon Mar 12 02:55:54 2001 +@@ -38,8 +38,8 @@ + $threadl = ""; + } + +-$libs = `gtk-config --libs $threadl`; +-$inc = `gtk-config --cflags $threadl`; ++$libs = `$ENV{GTK_CONFIG} --libs $threadl`; ++$inc = `$ENV{GTK_CONFIG} --cflags $threadl`; + $libs =~ s/\s+/ /g; + $inc =~ s/\s+/ /g; + +@@ -192,14 +192,14 @@ + sub gtk_version { + my($result); + +- $result = `gtk-config --version`; ++ $result = `$ENV{GTK_CONFIG} --version`; + chomp $result; + return $result; + } + + # build the keysyms mapping + sub build_ksyms { +- my ($incfile) = `gtk-config --prefix`; ++ my ($incfile) = `$ENV{GTK_CONFIG} --prefix`; + chomp($incfile); + $incfile .= "/include/gdk/gdkkeysyms.h"; + diff --git a/x11-toolkits/p5-Gtk/files/patch-Makefile.PL b/x11-toolkits/p5-Gtk/files/patch-Makefile.PL index f70ad88..c986eef 100644 --- a/x11-toolkits/p5-Gtk/files/patch-Makefile.PL +++ b/x11-toolkits/p5-Gtk/files/patch-Makefile.PL @@ -1,33 +1,16 @@ ---- Makefile.PL.orig Wed Aug 9 22:30:38 2000 -+++ Makefile.PL Tue Sep 12 11:54:31 2000 -@@ -102,10 +102,10 @@ - $threadl = ""; - } +--- Makefile.PL.orig Mon Mar 12 02:44:15 2001 ++++ Makefile.PL Mon Mar 12 02:55:13 2001 +@@ -13,11 +13,11 @@ --$libs = `gtk-config --libs $threadl`; -+$libs = `$ENV{GTK_CONFIG} --libs $threadl`; - $libs = "-L/usr/X11R6/lib -lgtk -lgdk -lglib -lX11 -lXext" if not defined $libs; - --$inc = `gtk-config --cflags $threadl`; -+$inc = `$ENV{GTK_CONFIG} --cflags $threadl`; - - $libs =~ s/\s+/ /g; - $inc =~ s/\s+/ /g; -@@ -167,7 +167,7 @@ - - # build the keysyms mapping - { -- my ($incfile) = `gtk-config --prefix`; -+ my ($incfile) = `$ENV{GTK_CONFIG} --prefix`; - chomp($incfile); - $incfile .= "/include/gdk/gdkkeysyms.h"; - -@@ -470,7 +470,7 @@ - sub gtk_version { - my($result); - -- $result = `gtk-config --version`; -+ $result = `$ENV{GTK_CONFIG} --version`; - chomp $result; - - if (not defined $result) { + %detect = ( + gtk => {order => 1, dir => 'Gtk', needed => 1, +- check => sub {cconfig('gtk-config --version', '1\.2\.')}}, ++ check => sub {cconfig("$ENV{GTK_CONFIG} --version", '1\.2\.')}}, + gdkimlib => {order => 2, dir => 'GdkImlib', + check => sub {cconfig('imlib-config --version', '1\.9\.') && `imlib-config --libs-gdk`}}, + gtkglarea => {order => 2, dir => 'GtkGLArea', +- check => sub {cconfig('gtk-config --version', '1\.2\.')}}, ++ check => sub {cconfig("$ENV{GTK_CONFIG} --version", '1\.2\.')}}, + gdkpixbuf => {order => 2, dir => 'GdkPixbuf', + check => sub {cconfig('gdk-pixbuf-config --version', '0\.9\.')}}, + gtkhtml => {order => 2, dir => 'GtkHTML', diff --git a/x11-toolkits/p5-Gtk/pkg-plist b/x11-toolkits/p5-Gtk/pkg-plist index 20d0a75..3d64607 100644 --- a/x11-toolkits/p5-Gtk/pkg-plist +++ b/x11-toolkits/p5-Gtk/pkg-plist @@ -3,8 +3,10 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Atoms.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/ColorSelectButton.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Keysyms.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LogHandler.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Types.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/io.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/Files.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h @@ -13,9 +15,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/genext.pl lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs @@ -27,12 +26,15 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/ppport.h -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP/http.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.bs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/base/.packlist +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LWP @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/base @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile index f45b819..ac504be 100644 --- a/x11-toolkits/p5-GtkXmHTML/Makefile +++ b/x11-toolkits/p5-GtkXmHTML/Makefile @@ -6,7 +6,7 @@ # PORTNAME= GtkXmHTML -PORTVERSION= 0.7004 +PORTVERSION= 0.7005 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk @@ -15,7 +15,7 @@ DISTNAME= Gtk-Perl-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk +BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome USE_GNOMELIBS= yes PERL_CONFIGURE= yes diff --git a/x11-toolkits/p5-GtkXmHTML/distinfo b/x11-toolkits/p5-GtkXmHTML/distinfo index ebd8f21..dee506a 100644 --- a/x11-toolkits/p5-GtkXmHTML/distinfo +++ b/x11-toolkits/p5-GtkXmHTML/distinfo @@ -1 +1 @@ -MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69 +MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa diff --git a/x11-toolkits/p5-GtkXmHTML/files/patch-Makefile.PL b/x11-toolkits/p5-GtkXmHTML/files/patch-Makefile.PL index d07de69..13ae0f3 100644 --- a/x11-toolkits/p5-GtkXmHTML/files/patch-Makefile.PL +++ b/x11-toolkits/p5-GtkXmHTML/files/patch-Makefile.PL @@ -1,25 +1,9 @@ ---- Makefile.PL.orig Tue Jun 20 18:37:12 2000 -+++ Makefile.PL Mon Oct 30 04:27:50 2000 +--- Makefile.PL.orig Mon Mar 12 06:23:16 2001 ++++ Makefile.PL Mon Mar 12 06:23:21 2001 @@ -1,6 +1,5 @@ use ExtUtils::MakeMaker; use File::Basename; -use blib '..'; - use Gtk::Install::Files; use Cwd; require '../Depends.pm'; -@@ -25,12 +24,12 @@ - $typemaps, [keys %defs], [@defines], [@headers], $pm); - - foreach (@typemaps) { -- print "Add typemap: $Gtk::Install::Files::CORE/$_\n"; -- push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_); -+ print "Add typemap: $Gtk::Install::Files::CORE$_\n"; -+ push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_); - } - - push(@defines, @Gtk::Install::Files::defines); --push(@defines, '-I../build', '-Ibuild', '-I.', '-I../Gtk'); -+push(@defines, '-I../build', '-Ibuild', '-I.', '-I'.$Gtk::Install::Files::CORE); - - $pm->{'GtkXmHTML.pm'} = '$(INST_ARCHLIBDIR)/XmHTML.pm'; - $pm->{'build/GtkXmHTMLTypes.pm'} = '$(INST_ARCHLIBDIR)/XmHTML/Types.pm'; + require '../tools/gendefs.pl'; diff --git a/x11-toolkits/p5-GtkXmHTML/pkg-plist b/x11-toolkits/p5-GtkXmHTML/pkg-plist index 045543b..3bf665c 100644 --- a/x11-toolkits/p5-GtkXmHTML/pkg-plist +++ b/x11-toolkits/p5-GtkXmHTML/pkg-plist @@ -1,10 +1,10 @@ -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GXHTypes.h -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/GtkXmHTMLDefs.h -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/PerlGtkXmHTMLInt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Types.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/Files.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GXHTypes.h +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLDefs.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/GtkXmHTMLTypemap +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/PerlGtkXmHTMLInt.h lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/XmHTML/Install/pkg.typemap lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/.packlist lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.bs |
