Attachment 4795 Details for Bug 11851 – file.diff

[patch] file.diff

file.diff (text/plain), 5.31 KB, created by reg on 1999-05-23 02:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: reg

Created: 1999-05-23 02:00:02 UTC

Size: 5.31 KB

patch

obsolete

>--- /usr/ports.ref/x11-toolkits/p5-Gtk/Makefile	Wed Mar 17 12:57:41 1999
>+++ x11-toolkits/p5-Gtk/Makefile	Mon May 10 01:36:20 1999
>@@ -1,13 +1,13 @@
> # New ports collection makefile for:	p5-Gtk
>-# Version required:	0.4
>+# Version required:	0.5121
> # Date created:		28 Oct 1997
> # Whom:	      		Vanilla I. Shu <vanilla@MinJe.com.TW>
> #
> # $Id: Makefile,v 1.22 1999/03/15 18:30:06 nectar Exp $
> #
> 
>-DISTNAME=	Gtk-0.4
>-PKGNAME=	p5-Gtk-0.4
>+DISTNAME=	Gtk-Perl-0.5121
>+PKGNAME=	p5-Gtk-0.5121
> CATEGORIES=	x11-toolkits lang perl5
> MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/perl/ \
> 		${MASTER_SITE_PERL_CPAN}
>@@ -15,16 +15,15 @@
> 
> MAINTAINER=	vanilla@FreeBSD.ORG
> 
>-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \
>-		gdk_imlib.3:${PORTSDIR}/graphics/imlib
>+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
> 
> USE_PERL5=	YES
> 
>-MAN3=		GtkColorSelectButton.3
>+MAN3=		Gtk::GtkColorSelectButton.3
> MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
> 
> do-configure:
> 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
>-		--with-gdkimlib
>+		--with-gdkimlib --without-gnome
> 
> .include <bsd.port.mk>
>--- /usr/ports.ref/x11-toolkits/p5-Gtk/files/md5	Fri Oct  9 17:59:17 1998
>+++ x11-toolkits/p5-Gtk/files/md5	Fri May  7 01:48:47 1999
>@@ -1 +1 @@
>-MD5 (Gtk-0.4.tar.gz) = dcd4d31722f579dea3bce84ce82b8076
>+MD5 (Gtk-Perl-0.5121.tar.gz) = 94fd8507302eb732117d029723364385
>--- /usr/ports.ref/x11-toolkits/p5-Gtk/patches/patch-aa	Fri Oct  9 17:59:17 1998
>+++ x11-toolkits/p5-Gtk/patches/patch-aa	Mon May 10 00:59:43 1999
>@@ -1,24 +1,15 @@
> --- Makefile.PL.orig	Tue Sep 29 18:49:53 1998
> +++ Makefile.PL	Fri Oct  9 01:11:11 1998
>-@@ -29,7 +29,7 @@
>- # One can also 'source' in the shell the proper gnomeConf.sh file
>- # before running perl Makefile.PL.
>- if (!defined $ENV{GTKXMHTML_LIBS} || !defined $ENV{GNOMEUI_LIBS}) {
>--	foreach (qw{/opt/lib /usr/local/lib /usr/lib /usr/X11R6/lib /opt/gnome/lib }) {
>-+	foreach (qw{/usr/X11R6/share/gnome }) {
>- 		open(GNOMEC, "$_/gnomeConf.sh") || next;
>- 		my $f= join('', <GNOMEC>);
>- 		close GNOMEC;
> @@ -43,10 +43,10 @@
>  
>  @defines = ();
>  
> -$libs = `gtk-config --libs`;
>-+$libs = `gtk11-config --libs`;
>++$libs = `gtk12-config --libs`;
>  $libs = "-L/usr/X11R6/lib -lgtk -lgdk -lglib -lX11 -lXext" if not defined $libs;
>  
> -$inc = `gtk-config --cflags`;
>-+$inc = `gtk11-config --cflags`;
>++$inc = `gtk12-config --cflags`;
>  
>  $libs =~ s/\s+/ /g;
>  $inc =~ s/\s+/ /g;
>@@ -27,7 +18,7 @@
>  	my($result);
>  
> -	$result = `gtk-config --version`;
>-+	$result = `gtk11-config --version`;
>++	$result = `gtk12-config --version`;
>  	chomp $result;
>  	
>  	if (not defined $result) {
>--- /usr/ports.ref/x11-toolkits/p5-Gtk/patches/patch-ab	Fri Oct  2 02:53:46 1998
>+++ x11-toolkits/p5-Gtk/patches/patch-ab	Mon May 10 01:01:15 1999
>@@ -1,10 +0,0 @@
>---- config/pkg-gdkimlib.pl.orig	Wed Sep 30 00:53:30 1998
>-+++ config/pkg-gdkimlib.pl	Wed Sep 30 00:53:43 1998
>-@@ -3,6 +3,6 @@
>- 
>- # we need to know what libraries are used by the
>- # gdk_imlib lib we are going to link to....
>--$libs =~ s/-l/-lgdk_imlib -lgif -ltiff -lpng -ljpeg -lz -l/; # hack hack
>-+$libs =~ s/-l/-lgdk_imlib -lgif -ltiff34 -lpng -ljpeg -lz -l/; # hack hack
>- 
>- add_boot "Gtk::Gdk::ImlibImage";
>--- /usr/ports.ref/x11-toolkits/p5-Gtk/pkg/PLIST	Mon Jan 11 17:34:55 1999
>+++ x11-toolkits/p5-Gtk/pkg/PLIST	Mon May 10 01:52:52 1999
>@@ -2,27 +2,13 @@
> 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/LogHandler.pm
> lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Types.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
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
>-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/gendefs.pl
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg-gdkimlib.defs
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg-gdkimlib.typemap
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg-gtk-1.1.defs
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg-gtk.defs
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg-gtk.typemap
> lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/.packlist
>-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/Gtk.bs
> lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
>+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
> @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk
> @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install
> @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk

Actions: View | Diff

Attachments on bug 11851: 4795