Date: Sun, 25 Nov 2007 22:36:35 +0100 From: "Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/118250: [patch] x11-toolkits/easygtk unbreak fix build with GCC 4.2 Message-ID: <1196026595.67919@gahrtop.localhost> Resent-Message-ID: <200711252140.lAPLe3St087836@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118250
>Category: ports
>Synopsis: [patch] x11-toolkits/easygtk unbreak fix build with GCC 4.2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 25 21:40:03 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 8.0-CURRENT #12: Tue Nov 20 17:46:40 CET 2007
root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034
>Description:
This patch:
- fixes build with GCC 4.2
- makes the port PORTDOCSDIR-safe
- makes the port PORTEXAMPLESDIR-safe
>How-To-Repeat:
cd /usr/ports/x11-toolkits/easygtk && make
>Fix:
--- _easygtk.diff begins here ---
--- Makefile.orig 2007-11-25 21:58:41.000000000 +0100
+++ Makefile 2007-11-25 22:29:23.000000000 +0100
@@ -27,10 +27,18 @@
MAKE_ENV= MKDIR="${MKDIR}" \
LN="${LN}"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/libeasygtk.a ${PREFIX}/lib/
+ ${INSTALL_DATA} ${WRKSRC}/easygtk.h ${PREFIX}/include/
+ ${INSTALL_PROGRAM} ${WRKSRC}/libeasygtk.so.1 ${PREFIX}/lib/
+ ${LN} -sf ${PREFIX}/lib/libeasygtk.so.1 ${PREFIX}/lib/libeasygtk.so
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/manual.html ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+ ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/example.c ${EXAMPLESDIR}/
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- files/patch-Makefile.orig 2007-11-25 22:12:49.000000000 +0100
+++ files/patch-Makefile 2007-11-25 22:13:14.000000000 +0100
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Feb 16 00:07:21 2000
-+++ Makefile Wed Jan 3 16:03:42 2001
-@@ -1,23 +1,31 @@
+--- Makefile.orig 2000-02-15 23:07:21.000000000 +0100
++++ Makefile 2007-11-25 22:09:04.000000000 +0100
+@@ -1,23 +1,21 @@
-CFLAGS = -Wall -O -I. -I/usr/X11R6/include -I/usr/lib/glib/include -I/usr/X11R6/include/X11 -DUSE_IMLIB -DUSE_GNOME -I/usr/include -DNEED_GNOMESUPPORT_H -I/usr/lib/gnome-libs/include -I/usr/X11R6/include -I/usr/lib/glib/include
-LIBS = -L. -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm -lgdk_imlib -L/usr/lib -lImlib -ljpeg -ltiff -lungif -lpng -lz -lm -lXext -L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -I/usr/include/glib -rdynamic -L/usr/lib -L/usr/X11R6/lib -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
-CC = gcc
@@ -14,22 +14,14 @@
$(CC) $(CFLAGS) -c easygtk.c
ar rc libeasygtk.a easygtk.o
ranlib libeasygtk.a
-+ $(CC) $(CFLAGS) -shared -fpic easygtk.c -o libeasygtk.so.1 $(LIBS)
-+ $(LN) -sf libeasygtk.so.1 libeasygtk.so
-
- install:
+-
+-install:
- cp libeasygtk.a /usr/lib/libeasygtk.a
- cp easygtk.h /usr/include/easygtk.h
- mkdir -p /usr/doc/EasyGTK
- cp manual.html /usr/doc/EasyGTK/manual.html
-+ $(BSD_INSTALL_DATA) libeasygtk.a $(PREFIX)/lib
-+ $(BSD_INSTALL_DATA) easygtk.h $(PREFIX)/include
-+ $(BSD_INSTALL_PROGRAM) libeasygtk.so.1 $(PREFIX)/lib
-+ $(LN) -sf $(PREFIX)/lib/libeasygtk.so.1 $(PREFIX)/lib/libeasygtk.so
-+ $(MKDIR) $(PREFIX)/share/doc/EasyGTK
-+ $(BSD_INSTALL_MAN) manual.html $(PREFIX)/share/doc/EasyGTK
-+ $(MKDIR) $(PREFIX)/share/examples/EasyGTK
-+ $(BSD_INSTALL_DATA) example.c $(PREFIX)/share/examples/EasyGTK
++ $(CC) $(CFLAGS) -shared -fpic easygtk.c -o libeasygtk.so.1 $(LIBS)
++ $(LN) -sf libeasygtk.so.1 libeasygtk.so
clean:
rm example testtree *.o *.a .libdep* *~ core
--- /dev/null 2007-11-25 22:31:03.000000000 +0100
+++ files/patch-easygtk.c 2007-11-25 22:02:34.000000000 +0100
@@ -0,0 +1,35 @@
+--- easygtk.c.orig 2007-11-25 22:00:42.000000000 +0100
++++ easygtk.c 2007-11-25 22:02:15.000000000 +0100
+@@ -875,8 +875,8 @@
+ strncpy(internal_result,out_string,1000);
+ return g_strdup(internal_result); }
+ strncpy(tmpstring,input_string,1024);
+- (char *)tokens[i=0] = (char *)strtok(tmpstring, " ");
+- while(((char *)tokens[++i] = (char *)strtok(NULL, " ")));
++ tokens[i=0] = (gchar *)strtok(tmpstring, " ");
++ while((tokens[++i] = (gchar *)strtok(NULL, " ")));
+ tokens[i] = NULL;
+ i++;
+ if(i<starting_at)
+@@ -899,8 +899,8 @@
+ static gchar tmpstring[1024];
+ gint i;
+ strncpy(tmpstring,input_string,1024);
+- (char *)tokens[i=0] = (char *)strtok(tmpstring, " ");
+- while (((char *)tokens[++i] = (char *)strtok(NULL, " ")));
++ tokens[i=0] = (gchar *)strtok(tmpstring, " ");
++ while ((tokens[++i] = (gchar *)strtok(NULL, " ")));
+ tokens[i] = NULL;
+ return(g_strdup(tokens[word_number]));
+ }
+@@ -911,8 +911,8 @@
+ static gchar tmpstring[1024];
+ gint i;
+ strncpy(tmpstring,input_string,1024);
+- (char *)tokens[i=0] = (char *)strtok(tmpstring, delim);
+- while (((char *)tokens[++i] = (char *)strtok(NULL, delim)));
++ tokens[i=0] = (gchar *)strtok(tmpstring, delim);
++ while ((tokens[++i] = (gchar *)strtok(NULL, delim)));
+ tokens[i] = NULL;
+ return(g_strdup(tokens[word_number]));
+ }
--- pkg-plist.orig 2007-11-25 22:32:56.000000000 +0100
+++ pkg-plist 2007-11-25 22:32:02.000000000 +0100
@@ -2,7 +2,7 @@
lib/libeasygtk.a
lib/libeasygtk.so
lib/libeasygtk.so.1
-share/doc/EasyGTK/manual.html
-share/examples/EasyGTK/example.c
-@dirrm share/examples/EasyGTK
-@dirrm share/doc/EasyGTK
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
--- _easygtk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1196026595.67919>