Attachment #82662 for bug #118250

View | Details | Raw Unified | Return to bug 118250
Collapse All | Expand All




MAKE_ENV=	MKDIR="${MKDIR}" \
		LN="${LN}"

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.mk>




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

 	$(CC) $(CFLAGS) -c easygtk.c
 	ar rc libeasygtk.a easygtk.o
 	ranlib libeasygtk.a
-
-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
+	$(CC) $(CFLAGS) -shared -fpic easygtk.c -o libeasygtk.so.1 $(LIBS)
+	$(LN) -sf libeasygtk.so.1 libeasygtk.so
+	$(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
 
 clean:
 	rm example testtree *.o *.a .libdep* *~ core




--- 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]));
 }

Lines 2-8 Link Here

(-)pkg-plist (-4 / +4 lines)
2	lib/libeasygtk.a	2	lib/libeasygtk.a
3	lib/libeasygtk.so	3	lib/libeasygtk.so
4	lib/libeasygtk.so.1	4	lib/libeasygtk.so.1
5	share/doc/EasyGTK/manual.html	5	%%PORTDOCS%%%%DOCSDIR%%/manual.html
6	share/examples/EasyGTK/example.c	6	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
7	@dirrm share/examples/EasyGTK	7	%%PORTDOCS%%@dirrm %%DOCSDIR%%
8	@dirrm share/doc/EasyGTK	8	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Return to bug 118250

Lines 27-36 Link Here

(-)Makefile (-5 / +13 lines)
27	MAKE_ENV= MKDIR="${MKDIR}" \	27	MAKE_ENV= MKDIR="${MKDIR}" \
28	LN="${LN}"	28	LN="${LN}"
29		29
30	.include <bsd.port.pre.mk>	30	do-install:
31		31	${INSTALL_DATA} ${WRKSRC}/libeasygtk.a ${PREFIX}/lib/
32	.if ${OSVERSION} >= 700042	32	${INSTALL_DATA} ${WRKSRC}/easygtk.h ${PREFIX}/include/
33	BROKEN= Broken with gcc 4.2	33	${INSTALL_PROGRAM} ${WRKSRC}/libeasygtk.so.1 ${PREFIX}/lib/
		34	${LN} -sf ${PREFIX}/lib/libeasygtk.so.1 ${PREFIX}/lib/libeasygtk.so
		35	.if !defined(NOPORTDOCS)
		36	${MKDIR} ${DOCSDIR}
		37	${INSTALL_MAN} ${WRKSRC}/manual.html ${DOCSDIR}/
		38	.endif
		39	.if !defined(NOPORTEXAMPLES)
		40	${MKDIR} ${EXAMPLESDIR}
		41	${INSTALL_DATA} ${WRKSRC}/example.c ${EXAMPLESDIR}/
34	.endif	42	.endif
35		43
36	.include <bsd.port.post.mk>	44	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)files/patch-Makefile (-15 / +7 lines)
1	--- Makefile.orig Wed Feb 16 00:07:21 2000	1	--- Makefile.orig 2000-02-15 23:07:21.000000000 +0100
2	+++ Makefile Wed Jan 3 16:03:42 2001	2	+++ Makefile 2007-11-25 22:09:04.000000000 +0100
3	@@ -1,23 +1,31 @@	3	@@ -1,23 +1,21 @@
4	-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	4	-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
5	-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	5	-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
6	-CC = gcc	6	-CC = gcc
Lines 14-35 Link Here
14	$(CC) $(CFLAGS) -c easygtk.c	14	$(CC) $(CFLAGS) -c easygtk.c
15	ar rc libeasygtk.a easygtk.o	15	ar rc libeasygtk.a easygtk.o
16	ranlib libeasygtk.a	16	ranlib libeasygtk.a
17	+ $(CC) $(CFLAGS) -shared -fpic easygtk.c -o libeasygtk.so.1 $(LIBS)	17	-
18	+ $(LN) -sf libeasygtk.so.1 libeasygtk.so	18	-install:
19
20	install:
21	- cp libeasygtk.a /usr/lib/libeasygtk.a	19	- cp libeasygtk.a /usr/lib/libeasygtk.a
22	- cp easygtk.h /usr/include/easygtk.h	20	- cp easygtk.h /usr/include/easygtk.h
23	- mkdir -p /usr/doc/EasyGTK	21	- mkdir -p /usr/doc/EasyGTK
24	- cp manual.html /usr/doc/EasyGTK/manual.html	22	- cp manual.html /usr/doc/EasyGTK/manual.html
25	+ $(BSD_INSTALL_DATA) libeasygtk.a $(PREFIX)/lib	23	+ $(CC) $(CFLAGS) -shared -fpic easygtk.c -o libeasygtk.so.1 $(LIBS)
26	+ $(BSD_INSTALL_DATA) easygtk.h $(PREFIX)/include	24	+ $(LN) -sf libeasygtk.so.1 libeasygtk.so
27	+ $(BSD_INSTALL_PROGRAM) libeasygtk.so.1 $(PREFIX)/lib
28	+ $(LN) -sf $(PREFIX)/lib/libeasygtk.so.1 $(PREFIX)/lib/libeasygtk.so
29	+ $(MKDIR) $(PREFIX)/share/doc/EasyGTK
30	+ $(BSD_INSTALL_MAN) manual.html $(PREFIX)/share/doc/EasyGTK
31	+ $(MKDIR) $(PREFIX)/share/examples/EasyGTK
32	+ $(BSD_INSTALL_DATA) example.c $(PREFIX)/share/examples/EasyGTK
33		25
34	clean:	26	clean:
35	rm example testtree .o .a .libdep* *~ core	27	rm example testtree .o .a .libdep* *~ core

Added Link Here

(-)files/patch-easygtk.c (+35 lines)
1	--- easygtk.c.orig 2007-11-25 22:00:42.000000000 +0100
2	+++ easygtk.c 2007-11-25 22:02:15.000000000 +0100
3	@@ -875,8 +875,8 @@
4	strncpy(internal_result,out_string,1000);
5	return g_strdup(internal_result); }
6	strncpy(tmpstring,input_string,1024);
7	- (char )tokens[i=0] = (char )strtok(tmpstring, " ");
8	- while(((char )tokens[++i] = (char )strtok(NULL, " ")));
9	+ tokens[i=0] = (gchar *)strtok(tmpstring, " ");
10	+ while((tokens[++i] = (gchar *)strtok(NULL, " ")));
11	tokens[i] = NULL;
12	i++;
13	if(i<starting_at)
14	@@ -899,8 +899,8 @@
15	static gchar tmpstring[1024];
16	gint i;
17	strncpy(tmpstring,input_string,1024);
18	- (char )tokens[i=0] = (char )strtok(tmpstring, " ");
19	- while (((char )tokens[++i] = (char )strtok(NULL, " ")));
20	+ tokens[i=0] = (gchar *)strtok(tmpstring, " ");
21	+ while ((tokens[++i] = (gchar *)strtok(NULL, " ")));
22	tokens[i] = NULL;
23	return(g_strdup(tokens[word_number]));
24	}
25	@@ -911,8 +911,8 @@
26	static gchar tmpstring[1024];
27	gint i;
28	strncpy(tmpstring,input_string,1024);
29	- (char )tokens[i=0] = (char )strtok(tmpstring, delim);
30	- while (((char )tokens[++i] = (char )strtok(NULL, delim)));
31	+ tokens[i=0] = (gchar *)strtok(tmpstring, delim);
32	+ while ((tokens[++i] = (gchar *)strtok(NULL, delim)));
33	tokens[i] = NULL;
34	return(g_strdup(tokens[word_number]));
35	}