Remove the workarounds for the bug in our sh since that has been fixed.

Ok naddy@

x11/gnome/applets/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2002/02/15 19:13:15 nino Exp $
+# $OpenBSD: Makefile,v 1.12 2002/03/02 15:45:50 nino Exp $
 
 COMMENT=		"applets for use with the GNOME panel"
 
@@ -15,7 +15,6 @@ EXTRACT_SUFX=		.tar.bz2
 
 LIB_DEPENDS=		panel_applet::x11/gnome/core \
 			gtop,gtop_common,gtop_sysdeps::devel/libgtop,gnome
-BUILD_DEPENDS=		:zsh-*:shells/zsh/stable
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -24,15 +23,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-MAKE_FLAGS+=		LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
 CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-# use zsh as a shell replacement
-pre-build:
-	ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh
-
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-applets; \
 	cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-applets/

x11/gnome/controlcenter/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/02/15 19:17:54 nino Exp $
+# $OpenBSD: Makefile,v 1.14 2002/03/02 15:45:50 nino Exp $
 
 COMMENT=		"GNOME control center"
 
@@ -16,7 +16,6 @@ EXTRACT_SUFX=		.tar.bz2
 LIB_DEPENDS=		gnomecanvaspixbuf,gdk_pixbuf::graphics/gdk-pixbuf,gnome \
 			gnome.36,gnorba,gtkxmhtml::x11/gnome/libs \
 			gnomevfs.::x11/gnome/vfs
-BUILD_DEPENDS=		:zsh-*:shells/zsh/stable
 
 BUILD_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
 RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
@@ -29,7 +28,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-MAKE_FLAGS+=		LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--localstatedir=/var/gnome
@@ -37,9 +35,7 @@ CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
-	@ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh; \
+	@cd ${WRKSRC}/control-center; ../xml-i18n-merge ../po gnomecc.desktop.in gnomecc.desktop -d -p
-	cd ${WRKSRC}/control-center; ../xml-i18n-merge ../po gnomecc.desktop.in gnomecc.desktop -d -p
-
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/control-center; \

x11/gnome/core/patches/patch-ltmain_sh

@@ -1,4 +1,4 @@
-$OpenBSD: patch-ltmain_sh,v 1.1 2002/02/15 19:18:52 nino Exp $
+$OpenBSD: patch-ltmain_sh,v 1.2 2002/03/02 15:45:50 nino Exp $
 --- ltmain.sh.orig	Fri Jan 25 01:45:33 2002
 +++ ltmain.sh	Tue Feb 12 21:02:54 2002
 @@ -1060,6 +1060,17 @@ compiler."
@@ -19,25 +19,6 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2002/02/15 19:18:52 nino Exp $
        -module)
  	module=yes
  	continue
-@@ -2060,6 +2071,10 @@ compiler."
- 	  eval tmp_libs=\"\$$var\"
- 	  new_libs=
- 	  for deplib in $tmp_libs; do
-+          # work around bug in our ksh (segfault)
-+            case " $new_libs " in
-+            *" $deplib "*);;
-+            *)
- 	    case $deplib in
- 	    -L*) new_libs="$deplib $new_libs" ;;
- 	    *)
-@@ -2074,6 +2089,7 @@ compiler."
- 	      esac
- 	      ;;
- 	    esac
-+            esac
- 	  done
- 	  tmp_libs=
- 	  for deplib in $new_libs; do
 @@ -4457,40 +4473,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0