FreeBSD Port: gtkada-1.2.12_1/zenity-1.8_1

Franz Klammer klammer at webonaut.com
Sun Mar 28 04:26:26 PST 2004


gtk-ada and zenity are installing both gdialog into X11R6/bin.
attached a patch that adds a WITHOUT_GDIALOG knob to x11/zenity.

you can apply this patch by doing:

cd /usr/ports
patch -p0 < zenity-conflicts-240.diff

question to the gnome-team: should i also made this patch
for zenity-2.6.0 or is it not a good idea?

if the patch is not attached please download it also from:
http://webonaut.com/temp/zenity-conflicts-240.diff

franz.


Jeff Mitchell wrote:

> Folks--
>  
> I'm getting an error installing x11/zenity because gtkada and zenity 
> aren't playing nicely together.  Following is the output:
>  
> ===>  Installing for zenity-1.8_1
>  
> ===>  zenity-1.8_1 conflicts with installed package(s):
>       gtkada-1.2.12_1
>       They install files into the same place.
>       Please remove them first with pkg_delete(1).
> *** Error code 1
>  
> Stop in /usr/ports/x11/zenity.
> Do either of you have an idea as to what I should do to get zenity 
> installed?  I'm not sure if I need gtkada, or even if I need zenity, 
> so maybe the right thing to do is just get rid of one of them...but I 
> don't really know.
>  
> Thanks,
> Jeff


-- 
webonaut.com :: web technology
klammer at webonaut.com :: http://webonaut.com/
fon +43-664-3434708
--
MIG_media intelligence group > agentur für werbung & neue medien
A-5020 Salzburg > Linzergasse 21

Fon +43-662-453091-0 > Fax -99
office at mig.co.at > http://www.mig.co.at
--

-------------- next part --------------
diff -Nur zenity.orig/Makefile zenity/Makefile
--- zenity.orig/Makefile	Wed Feb  4 06:09:53 2004
+++ zenity/Makefile	Sun Mar 28 13:14:36 2004
@@ -31,7 +31,13 @@
 
 MAN1=		zenity.1
 
+.if !defined(WITHOUT_GDIALOG)
 CONFLICTS=	gtkada-1.2.*
+PLIST_SUB=	GDIALOG=
+.else
+PLIST_SUB=	GDIALOG="@comment "
+EXTRA_PATCHES=	files/xpatch-src::Makefile.in
+.endif
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff -Nur zenity.orig/files/xpatch-src::Makefile.in zenity/files/xpatch-src::Makefile.in
--- zenity.orig/files/xpatch-src::Makefile.in	Thu Jan  1 01:00:00 1970
+++ zenity/files/xpatch-src::Makefile.in	Sun Mar 28 12:58:46 2004
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun Mar 28 12:57:36 2004
++++ src/Makefile.in	Sun Mar 28 12:57:54 2004
+@@ -107,7 +107,7 @@
+ 
+ bin_PROGRAMS = zenity
+ 
+-bin_SCRIPTS = gdialog
++bin_SCRIPTS = 
+ 
+ zenity_SOURCES = \
+ 	main.c		\
diff -Nur zenity.orig/pkg-plist zenity/pkg-plist
--- zenity.orig/pkg-plist	Thu Sep 18 08:49:36 2003
+++ zenity/pkg-plist	Sun Mar 28 13:07:45 2004
@@ -1,4 +1,4 @@
-bin/gdialog
+%%GDIALOG%%bin/gdialog
 bin/zenity
 share/gnome/omf/zenity/zenity-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true


More information about the freebsd-gnome mailing list