Attachment 82662 Details for Bug 118250 – _easygtk.diff

[patch] _easygtk.diff

_easygtk.diff (text/plain), 4.64 KB, created by Pietro Cerutti on 2007-11-25 21:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2007-11-25 21:40:03 UTC

Size: 4.64 KB

patch

obsolete

>--- 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%%

Actions: View | Diff

Attachments on bug 118250: 82662