aboutsummaryrefslogtreecommitdiffstats
path: root/french/gfaim
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-12-19 02:41:43 +0800
committermiwi <miwi@FreeBSD.org>2007-12-19 02:41:43 +0800
commit0c79cc8e464671e83b6e27f6c1a9aa2a332f15af (patch)
tree53f9ba9672d51e64634ac997f8ba858ade52a5c5 /french/gfaim
parent944fe542f48cb572b2a35efaa1c56737a534db5e (diff)
downloadfreebsd-ports-gnome-0c79cc8e464671e83b6e27f6c1a9aa2a332f15af.tar.gz
freebsd-ports-gnome-0c79cc8e464671e83b6e27f6c1a9aa2a332f15af.tar.zst
freebsd-ports-gnome-0c79cc8e464671e83b6e27f6c1a9aa2a332f15af.zip
- Update MASTER_SITES
- Fix build with gcc 4.2 - Pass maintainership to submitter PR: 118794 Submitted by: Pietro Cerutti <gahr@gahr.ch>
Diffstat (limited to 'french/gfaim')
-rw-r--r--french/gfaim/Makefile15
-rw-r--r--french/gfaim/files/patch-gfaim.c46
2 files changed, 51 insertions, 10 deletions
diff --git a/french/gfaim/Makefile b/french/gfaim/Makefile
index c7faa4d98ef9..47c0d41e02c5 100644
--- a/french/gfaim/Makefile
+++ b/french/gfaim/Makefile
@@ -9,13 +9,14 @@ PORTNAME= gfaim
PORTVERSION= 0.30
PORTREVISION= 3
CATEGORIES= french
-MASTER_SITES= http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
+MASTER_SITES= http://freeperso.free.fr/ \
+ http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gahr@gahr.ch
COMMENT= Gfaim est un logiciel de recherche de recettes de cuisine
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gtk12
DATADIR?= ${PREFIX}/lib/gfaim
@@ -29,10 +30,4 @@ PORTDOCS= legal.txt lisezmoi.txt
MAKE_ENV+= NOPORTDOCS=yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/french/gfaim/files/patch-gfaim.c b/french/gfaim/files/patch-gfaim.c
new file mode 100644
index 000000000000..28671bcfeae7
--- /dev/null
+++ b/french/gfaim/files/patch-gfaim.c
@@ -0,0 +1,46 @@
+--- gfaim.c.orig 2000-11-21 20:58:42.000000000 +0100
++++ gfaim.c 2007-12-17 22:37:41.000000000 +0100
+@@ -1142,7 +1142,7 @@
+ champs=g_strsplit(buf,":",0);
+
+ /*le numero de la recette*/
+- plist[i].numero=atoi(champs[0]);
++ plist[i].numero= atoi(champs[0]);
+
+ /*le nom de la recette*/
+ strcpy(buffer,champs[1]);
+@@ -1188,7 +1188,7 @@
+
+ /*recherche de rlibelle dans buf*/
+
+- (int *) loc = strcasestr(buf,rlibelle);
++ loc = strcasestr(buf,rlibelle);
+
+ /* si c'est zero je passe*/
+ if (loc != NULL)
+@@ -1203,7 +1203,7 @@
+
+ gtk_clist_append( (GtkCList *) data,texte[0]);
+ /*accroche numero au titre de la recette comme index*/
+- gtk_clist_set_row_data(GTK_CLIST(liste),ligne,(int *) plist[k].numero);
++ gtk_clist_set_row_data(GTK_CLIST(liste),ligne, &plist[k].numero);
+ ligne++;
+ g_free(label);
+
+@@ -1242,12 +1242,12 @@
+ {
+ gchar *text = NULL;
+
+- int position;
++ int *position;
+
+ /* renseigne les variables de la position de la recette */
+- (int *) position=gtk_clist_get_row_data(GTK_CLIST(liste),row);
+- vdebut=plist[position].rdebut;
+- vfin=plist[position].rfin;
++ position=gtk_clist_get_row_data(GTK_CLIST(liste),row);
++ vdebut=plist[*position].rdebut;
++ vfin=plist[*position].rfin;
+
+ /*affiche la recette*/
+ charge_recette(vdebut,vfin);