5 files changed, 9 insertions, 202 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 0db5da8e7628..0e1277c4e156 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,36 +3,31 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
+#    $MCom: ports/www/kazehakase/Makefile,v 1.2 2005/11/29 02:39:04 ahze Exp $
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.3.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/17175
+MASTER_SITE_SUBDIR=	${PORTNAME}/17700
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX}
-
 USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-gecko-engine=${MOZILLA:S/-devel//} \
+USE_GECKO=	firefox mozilla
+CONFIGURE_ARGS=	--with-gecko_engine=${GECKO} \
 		--disable-ssl
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
 MAN1=		kazehakase.1
 
-FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
-
 .if defined(WITH_MIGEMO)
 USE_RUBY=	yes
 USE_PERL=	yes
@@ -41,8 +36,7 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .endif
 
 .include <bsd.port.pre.mk>
-
-WITH_MOZILLA?=	firefox
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
 # !!! gtk-webcore higly experimental right now and not very stable !!!
 # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
@@ -57,28 +51,6 @@ CONFIGURE_ARGS+=--enable-gtk-webcore
 USE_GHOSTSCRIPT=yes
 .endif
 
-.if !defined(WITH_MOZILLA)
-MOZILLA=	firefox
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla"
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel"
-MOZILLA=	mozilla
-HEADERS_SUFX=
-#HEADERS_SUFX=	-devel
-.if ${OSVERSION} < 500000
-USE_GCC=	3.4
-.endif
-.else
-MOZILLA=	firefox
-HEADERS_SUFX=
-.endif
-.endif
-.endif
-
 .if exists(${LOCALBASE}/bin/estxview)
 WITH_ESTRAIER=	yes
 .endif
@@ -104,20 +76,8 @@ pre-everything::
 	@${ECHO_MSG} "Disable Estraier, A full-text search engine for searching your history"
 	@${ECHO_MSG} " by defining WITHOUT_ESTRAIER"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default ${PORTNAME} uses www/firefox for Gecko support, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " firefox "
-	@${ECHO_MSG} " mozilla "
-#	@${ECHO_MSG} " mozilla-devel "
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " Currently you are using ${WITH_MOZILLA}"
-	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
-		s|%%MOZILLA%%|${MOZILLA}|; s|%%HEADERS_SUFX%%|${HEADERS_SUFX}|g' \
-			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/share/migemo|${LOCALBASE}/share/migemo|; \
 		s|=beginner|=medium|' ${WRKSRC}/etc/kzrc
 .if defined(WITH_MIGEMO)
@@ -127,18 +87,4 @@ post-patch:
 	@${ECHO_MSG} "create_thumbnail=true" >> ${WRKSRC}/etc/kzrc
 .endif
 
-post-configure:
-	@${CP} -f ${FILESDIR}/mkinstalldirs ${WRKSRC}
-	@${CHMOD} +x ${WRKSRC}/mkinstalldirs
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%MOZILLA%%|${MOZILLA}|g ; \
-		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' < ${FILESDIR}/kazehakase \
-		> ${WRKDIR}/kazehakase
-
-post-install:
-	@${MV} -f ${PREFIX}/bin/kazehakase ${PREFIX}/bin/kazehakase-bin
-	${INSTALL_SCRIPT} ${WRKDIR}/kazehakase ${PREFIX}/bin
-
 .include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index ea1f826b52e9..2a0e966727ed 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.3.2.tar.gz) = 0059c24a8c7edf3e0388eedbe7a8217d
-SHA256 (kazehakase-0.3.2.tar.gz) = 56d92414179015a1a24e6f759b7b29777dd190a21ba5740d5d282dc8747b4728
-SIZE (kazehakase-0.3.2.tar.gz) = 1296729
+MD5 (kazehakase-0.3.3.tar.gz) = 48e398034c087e6f7a344fdd8e30dbd5
+SHA256 (kazehakase-0.3.3.tar.gz) = f3d240160b00591ce37d80c42ba3386f5ab4e40b45120ef69fe0cd316b0ed3ac
+SIZE (kazehakase-0.3.3.tar.gz) = 1311717
diff --git a/www/kazehakase/files/kazehakase b/www/kazehakase/files/kazehakase
deleted file mode 100644
index 6c8ecb696a98..000000000000
--- a/www/kazehakase/files/kazehakase
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-dist_bin=`dirname $0`
-
-MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-
-if [ -z "$MOZ_PLUGIN_PATH" ]; then
-    MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-    export MOZ_PLUGIN_PATH
-fi
-
-if [ -n "$LD_LIBRARY_PATH" ]; then
-  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZILLA_HOME
-fi
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
-
-if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then
-    LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1
-    export LD_PRELOAD
-fi
-
-exec "%%PREFIX%%/bin/kazehakase-bin" "$@"
diff --git a/www/kazehakase/files/mkinstalldirs b/www/kazehakase/files/mkinstalldirs
deleted file mode 100644
index d2d5f21b6112..000000000000
--- a/www/kazehakase/files/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index e9d2b2e3fd5b..5ca1f06b9173 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -1,5 +1,4 @@
 bin/kazehakase
-bin/kazehakase-bin
 etc/kazehakase/bookmarkbar.xml
 etc/kazehakase/bookmarks.xml
 etc/kazehakase/kz-ui-beginner.xml