Index: head/german/steak/Makefile
===================================================================
--- head/german/steak/Makefile	(revision 364851)
+++ head/german/steak/Makefile	(revision 364852)
@@ -1,55 +1,58 @@
 # Created by: Heiner <h.eichmann@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	steak
 PORTVERSION=	1.7.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	german
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Steak%20${PORTVERSION} \
 		http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/
 DISTNAME=	Steak.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English <-> German dictionary under the GPL
 
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
 
-USE_XORG=	xt
+USES=		tar:bzip2
 MAKE_JOBS_UNSAFE=	yes
+WRKSRC=		${WRKDIR}/Steak
+OPTIONS_DEFINE=	GTK1
+OPTIONS_DEFAULT=	GTK1
 
-.if defined(WITHOUT_XSTEAK)
-USE_XORG=	x11
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGTK1}
+USE_XORG=	xt
 USE_GNOME=	gtk12
 MAKE_ARGS=	-D xsteak
-.endif
-WRKSRC=		${WRKDIR}/Steak
-USES=	tar:bzip2
-
-.if defined(WITHOUT_XSTEAK)
-PLIST_SUB+=	NOXSTEAK:="@comment "
+PLIST_SUB+=	XSTEAK=""
 .else
-PLIST_SUB+=	NOXSTEAK:=""
+USE_XORG=	x11
+PLIST_SUB+=	XSTEAK="@comment "
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e "s,\$$HOME/bin/Steak/Datensatz,${PREFIX}/share/steak/Datensatz,; \
 			s,BINDIR=\$$HOME/bin/Steak,BINDIR=${DATADIR},; \
 			s,$$BINDIR/help.txt,${DATADIR}/help.txt,g" ${WRKSRC}/woerterbuch
-	${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g" ${WRKSRC}/Printbuffer/Makefile
+	${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g; s,CC = gcc,CC ?= gcc," ${WRKSRC}/Printbuffer/Makefile
+	${REINPLACE_CMD} -e "s,CC = gcc,CC ?= gcc," ${WRKSRC}/Poll/Makefile
+	${REINPLACE_CMD} -e "s,CC = gcc,CC ?= gcc," ${WRKSRC}/SpaceFilter/Makefile
+	${REINPLACE_CMD} -e "s,gcc,${CC}," ${WRKSRC}/Xsteak/Makefile_gtk_1.2
 
 do-install:
-.if !defined(WITHOUT_XSTEAK)
-	${INSTALL_PROGRAM} ${WRKSRC}/Xsteak/xsteak ${PREFIX}/bin/
+.if ${PORT_OPTIONS:MGTK1}
+	${INSTALL_PROGRAM} ${WRKSRC}/Xsteak/xsteak ${STAGEDIR}${PREFIX}/bin/
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/woerterbuch ${PREFIX}/bin/steak
-	${MKDIR} ${DATADIR}/Datensatz
-	${INSTALL_DATA} ${WRKSRC}/Datensatz/* ${DATADIR}/Datensatz
+	${INSTALL_SCRIPT} ${WRKSRC}/woerterbuch ${STAGEDIR}${PREFIX}/bin/steak
+	@${MKDIR} ${STAGEDIR}${DATADIR}/Datensatz
+	${INSTALL_DATA} ${WRKSRC}/Datensatz/* ${STAGEDIR}${DATADIR}/Datensatz
 	cd ${WRKSRC}; ${INSTALL_DATA} README README.eng help.txt \
 		mini_steak_icon.xpm pinguin_steak_icon.xpm \
-		.Steakconfig ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/Xpm/* ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/iso2txt ${DATADIR}
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} poll printbuffer spacefilter ${DATADIR}
+		.Steakconfig ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/Xpm/* ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/iso2txt ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} poll printbuffer spacefilter ${STAGEDIR}${DATADIR}
+
 .include <bsd.port.mk>
Index: head/german/steak/files/patch-Poll:poll.c
===================================================================
--- head/german/steak/files/patch-Poll:poll.c	(revision 364851)
+++ head/german/steak/files/patch-Poll:poll.c	(nonexistent)
@@ -1,11 +0,0 @@
---- Poll/poll.c.orig	Mon Jul 29 01:35:10 2002
-+++ Poll/poll.c	Sun Jan 26 10:59:31 2003
-@@ -26,7 +26,7 @@
-    
-    
-    /*signal(SIGCLD, SIG_IGN);*/
--   signal(SIGCLD, parent_terminate);  
-+   signal(SIGCHLD, parent_terminate);  
-    
-    /*printf("pid des Prozesses = %d, Parent-pid des Prozesses = %d\n\n",getpid(), getppid());*/
-    

Property changes on: head/german/steak/files/patch-Poll:poll.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/german/steak/files/patch-Poll__poll.c
===================================================================
--- head/german/steak/files/patch-Poll__poll.c	(nonexistent)
+++ head/german/steak/files/patch-Poll__poll.c	(revision 364852)
@@ -0,0 +1,11 @@
+--- Poll/poll.c.orig	Mon Jul 29 01:35:10 2002
++++ Poll/poll.c	Sun Jan 26 10:59:31 2003
+@@ -26,7 +26,7 @@
+    
+    
+    /*signal(SIGCLD, SIG_IGN);*/
+-   signal(SIGCLD, parent_terminate);  
++   signal(SIGCHLD, parent_terminate);  
+    
+    /*printf("pid des Prozesses = %d, Parent-pid des Prozesses = %d\n\n",getpid(), getppid());*/
+    

Property changes on: head/german/steak/files/patch-Poll__poll.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/german/steak/pkg-plist
===================================================================
--- head/german/steak/pkg-plist	(revision 364851)
+++ head/german/steak/pkg-plist	(revision 364852)
@@ -1,22 +1,22 @@
 bin/steak
-%%NOXSTEAK:%%bin/xsteak
+%%XSTEAK%%bin/xsteak
 %%DATADIR%%/iso2txt
 %%DATADIR%%/poll
 %%DATADIR%%/printbuffer
 %%DATADIR%%/spacefilter
 %%DATADIR%%/Datensatz/README
 %%DATADIR%%/Datensatz/datenbankaktualisieren.sh
 %%DATADIR%%/Datensatz/ger-eng.txt
 %%DATADIR%%/Datensatz/insert_my_words.txt
 %%DATADIR%%/README
 %%DATADIR%%/README.eng
 %%DATADIR%%/help.txt
 %%DATADIR%%/ksteak.xpm
 %%DATADIR%%/mini-ksteak.xpm
 %%DATADIR%%/pinguin_steak_icon_old.xpm
 %%DATADIR%%/mini_steak_icon.xpm
 %%DATADIR%%/pinguin_steak_icon.xpm
 %%DATADIR%%/.Steakconfig
 %%DATADIR%%/steak.xpm
 @dirrm %%DATADIR%%/Datensatz
 @dirrm %%DATADIR%%