4 files changed, 60 insertions, 25 deletions

diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index 2f81b982b9c9..72552106ff90 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sobomax
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@gahr.ch
 COMMENT=	A wrapper library for GTK+ which provides simplified GUI API
 
 EXTRACT_BEFORE_ARGS=	# it's intentionally left blank
@@ -27,10 +27,18 @@ USE_LDCONFIG=	yes
 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>
diff --git a/x11-toolkits/easygtk/files/patch-Makefile b/x11-toolkits/easygtk/files/patch-Makefile
index a47ac184106b..23f6df10ee34 100644
--- a/x11-toolkits/easygtk/files/patch-Makefile
+++ b/x11-toolkits/easygtk/files/patch-Makefile
@@ -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
diff --git a/x11-toolkits/easygtk/files/patch-easygtk.c b/x11-toolkits/easygtk/files/patch-easygtk.c
new file mode 100644
index 000000000000..d1cf0568c8d8
--- /dev/null
+++ b/x11-toolkits/easygtk/files/patch-easygtk.c
@@ -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]));
+ }
diff --git a/x11-toolkits/easygtk/pkg-plist b/x11-toolkits/easygtk/pkg-plist
index 9942ca782c8d..7bc6975290ff 100644
--- a/x11-toolkits/easygtk/pkg-plist
+++ b/x11-toolkits/easygtk/pkg-plist
@@ -2,7 +2,7 @@ include/easygtk.h
 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%%