Date: Mon, 10 Jun 2002 18:34:53 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Alfred Perlstein <alfred@freebsd.org> Cc: bsmith <bsmith@atomz.com>, gnome@freebsd.org Subject: Re: xscreensaver Message-ID: <3D04C71D.C3A80D68@FreeBSD.org> References: <20020609185159.J1920@foo-sc.atomz.com> <20020610054059.GG88163@elvis.mu.org> <20020610002724.K1920@foo-sc.atomz.com> <20020610145941.GL88163@elvis.mu.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Alfred Perlstein wrote:
>
> * bsmith <bsmith@atomz.com> [020610 00:27] wrote:
> > The following diff's are fixes to allow xscreensaver to build properly on
> > FreeBSD. The problem currently is that the data returned by pkg-config:
> > root0pctaurii~ pkg-config gtk+ --libs
>
> Reworked diffs including PORTREVISION bump, please apply.
Commited, thanks!
-Maxim
>
> Index: devel/glib12/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/devel/glib12/Makefile,v
> retrieving revision 1.46
> diff -u -r1.46 Makefile
> --- devel/glib12/Makefile 12 Dec 2001 04:51:10 -0000 1.46
> +++ devel/glib12/Makefile 10 Jun 2002 14:56:23 -0000
> @@ -7,7 +7,7 @@
>
> PORTNAME= glib
> PORTVERSION= 1.2.10
> -PORTREVISION= 5
> +PORTREVISION= 6
> CATEGORIES= devel
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/glib
> Index: devel/glib12/files/patch-glib::glib.pc.in
> ===================================================================
> RCS file: devel/glib12/files/patch-glib::glib.pc.in
> diff -N devel/glib12/files/patch-glib::glib.pc.in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ devel/glib12/files/patch-glib::glib.pc.in 10 Jun 2002 14:48:04 -0000
> @@ -0,0 +1,10 @@
> +--- glib.pc.in.old Mon Jun 10 07:47:22 2002
> ++++ glib.pc.in Mon Jun 10 07:47:32 2002
> +@@ -6,6 +6,6 @@
> + Name: GLib
> + Description: C Utility Library
> + Version: @VERSION@
> +-Libs: -L${libdir} -lglib
> ++Libs: -L${libdir} -lglib12
> + Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include
> +
> Index: x11-toolkits/gtk12/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/x11-toolkits/gtk12/Makefile,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile
> --- x11-toolkits/gtk12/Makefile 12 Apr 2002 17:10:13 -0000 1.80
> +++ x11-toolkits/gtk12/Makefile 10 Jun 2002 14:56:14 -0000
> @@ -7,7 +7,7 @@
>
> PORTNAME= gtk
> PORTVERSION= 1.2.10
> -PORTREVISION= 4
> +PORTREVISION= 5
> CATEGORIES= x11-toolkits
> MASTER_SITES= ${MASTER_SITE_GNOME}
> MASTER_SITE_SUBDIR= stable/sources/gtk+
> Index: x11-toolkits/gtk12/files/patch-gdk::gdk.pc.in
> ===================================================================
> RCS file: x11-toolkits/gtk12/files/patch-gdk::gdk.pc.in
> diff -N x11-toolkits/gtk12/files/patch-gdk::gdk.pc.in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11-toolkits/gtk12/files/patch-gdk::gdk.pc.in 10 Jun 2002 14:43:33 -0000
> @@ -0,0 +1,9 @@
> +--- gdk.pc.in.old Mon Jun 10 07:42:43 2002
> ++++ gdk.pc.in Mon Jun 10 07:42:35 2002
> +@@ -7,5 +7,5 @@
> + Description: GIMP Drawing Kit
> + Version: @VERSION@
> + Requires: glib
> +-Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
> ++Libs: -L${libdir} @x_ldflags@ -lgdk12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
> + Cflags: -I${includedir}/gtk-1.2 @x_cflags@
> Index: x11-toolkits/gtk12/files/patch-gtk::gtk+.pc.in
> ===================================================================
> RCS file: x11-toolkits/gtk12/files/patch-gtk::gtk+.pc.in
> diff -N x11-toolkits/gtk12/files/patch-gtk::gtk+.pc.in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ x11-toolkits/gtk12/files/patch-gtk::gtk+.pc.in 10 Jun 2002 14:44:12 -0000
> @@ -0,0 +1,9 @@
> +--- gtk+.pc.in.old Mon Jun 10 07:41:57 2002
> ++++ gtk+.pc.in Mon Jun 10 07:42:09 2002
> +@@ -7,5 +7,5 @@
> + Description: GIMP Tool Kit
> + Version: @VERSION@
> + Requires: gdk
> +-Libs: -L${libdir} -lgtk
> ++Libs: -L${libdir} -lgtk12
> + Cflags:
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-gnome" in the body of the message
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D04C71D.C3A80D68>