Update ns-remote to 1.12:

 - Add PKG_DESTDIR_SUPPORT
 - Move source to code.google and import Makefile, patches and ns-open
   script from pkgsrc

6 files changed, 12 insertions, 220 deletions

diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index 01c6a4ec7fa..93e4c5b6bb9 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,32 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2008/01/01 16:45:35 abs Exp $
+# $NetBSD: Makefile,v 1.35 2009/02/10 12:39:57 abs Exp $
 
-DISTNAME=	ns-remote
-PKGNAME=	ns-remote-1.11
-PKGREVISION=	4
+DISTNAME=	ns-remote-1.12
 CATEGORIES=	www
-MASTER_SITES=	http://home.netscape.com/newsref/std/
-DISTFILES=	remote.c vroot.h
+MASTER_SITES=	http://ns-remote.googlecode.com/files/
+EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://www.netscape.com/newsref/std/x-remote.html
+HOMEPAGE=	http://code.google.com/p/ns-remote/
 COMMENT=	Remote-control of Netscape and Mozilla-based browsers
 
-DIST_SUBDIR=	netscape
-
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-INSTALLATION_DIRS=	bin
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-.for distfile in ${DISTFILES}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${distfile} ${WRKSRC}
-.endfor
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin
+PKG_DESTDIR_SUPPORT= user-destdir
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/www/ns-remote/PLIST b/www/ns-remote/PLIST
index 56a1b62cf5a..c66539fb85a 100644
--- a/www/ns-remote/PLIST
+++ b/www/ns-remote/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:33 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/02/10 12:39:57 abs Exp $
 bin/ns-open
 bin/ns-remote
+share/doc/ns-remote.README
diff --git a/www/ns-remote/distinfo b/www/ns-remote/distinfo
index 337a022697f..0541e633335 100644
--- a/www/ns-remote/distinfo
+++ b/www/ns-remote/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/03/08 20:15:14 bad Exp $
+$NetBSD: distinfo,v 1.5 2009/02/10 12:39:57 abs Exp $
 
-SHA1 (netscape/remote.c) = 7473c12d03ecc24b3a2e6af95b5154802117b793
-RMD160 (netscape/remote.c) = d89e8aaa497f88452760033a640653ab582a86e9
-Size (netscape/remote.c) = 18579 bytes
-SHA1 (netscape/vroot.h) = 3713a3021ee940b7a642478f91e0348524da22d9
-RMD160 (netscape/vroot.h) = afff0788fa6f0e15d96bb526fea4fa7025ff4135
-Size (netscape/vroot.h) = 4930 bytes
-SHA1 (patch-aa) = fb107b802ac690b86d90e4d566d18e8747a00295
+SHA1 (ns-remote-1.12.tbz) = d13f1061c8ec024fdf2601a0ad0881075948cede
+RMD160 (ns-remote-1.12.tbz) = 230175625b4364afba34a2681b90b9a8310865f6
+Size (ns-remote-1.12.tbz) = 10424 bytes
diff --git a/www/ns-remote/files/Makefile b/www/ns-remote/files/Makefile
deleted file mode 100644
index a0ae7711872..00000000000
--- a/www/ns-remote/files/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:27 jlam Exp $
-#
-# Very simple Makefile used to compile Netscape's ns-remote program
-#
-
-PROG	= ns-remote
-
-all:	${PROG}
-
-${PROG}:	remote.c
-	${CC} ${CFLAGS} -o ${PROG} remote.c -DSTANDALONE \
-	    ${LDFLAGS} -lXmu -lXt -lSM -lICE -lXext -lX11
-
-clean:
-	rm ${PROG}
diff --git a/www/ns-remote/files/ns-open b/www/ns-remote/files/ns-open
deleted file mode 100755
index bef4ba2fa83..00000000000
--- a/www/ns-remote/files/ns-open
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ns-open,v 1.18 2008/01/01 16:45:35 abs Exp $
-#
-# Simple script to open a URL in Netscape, starting a new process if necessary
-# If a netscape process is not running it will look for a valid netscape
-# binary in the colon separated NETSCAPE_PREFERRED list, which can be
-# overridden by the user in the environment.
-
-if [ -z "$NETSCAPE_PREFERRED" ]; then
-    NETSCAPE_PREFERRED=firefox:seamonkey:netscape7:mozilla:communicator:navigator:mozilla-netbsd:mozilla-linux:mozilla-solaris:firefox-netbsd:firefox-gtk2-linux:firefox-linux:firefox-solaris
-fi
-
-# Locate appropriate netscape binary and set NETSCAPE_BIN
-# If we cannot locate, do not fail with an error here as we may still be
-# able to use ns-remote to talk to an existing netscape process.
-#
-oldIFS="$IFS"
-IFS="${IFS}:"
-for prog in $NETSCAPE_PREFERRED ; do
-    case $prog in
-	/*) if [ -x $prog ]; then
-		NETSCAPE_BIN=$prog
-		break 2
-	    fi
-	    ;;
-	*)  for dir in $PATH;do
-		if [ -x $dir/$prog ];then
-		    NETSCAPE_BIN=$dir/$prog
-		    break 2
-		fi
-	    done
-	    ;;
-    esac
-done
-IFS="$oldIFS"
-
-escape()
-    {
-    str=$1
-    echo "$str" | sed -e 's/ /%20/g' -e 's/"/%22/g' -e 's/,/%2c/g' -e 's/\`/%60/g'
-    }
-
-# Check if there are any '-' options which would not be understood by ns-remote
-# Slightly involved to avoid changing $@ in case we need it for real netscape
-#
-for a
-do
-    if [ "$SKIP_ARG" = 1 ];then
-	NS_REMOTE_ARGS="$NS_REMOTE_ARGS $a"
-	SKIP_ARG=0
-	continue
-    fi
-    case $a in
-	-display | -id)
-	    SKIP_ARG=1
-	    ;;
-	-remote)
-	    REMOTE_SPECIFIED=1
-	    SKIP_ARG=1
-	    ;;
-	-raise | -noraise)
-	    RAISE=
-	    ;;
-	-* ) # Unrecognised option
-	    START_NEW_NETSCAPE=1
-	    ;;
-	*)
-	    URL=`escape "$a"`
-	    break;
-	    ;;
-    esac
-    NS_REMOTE_ARGS="$NS_REMOTE_ARGS $a"
-done
-
-# If we recognised all the options, try ns-remote
-#
-if [ -z "$START_NEW_NETSCAPE" ];then
-    NS_REMOTE_ARGS="$NS_REMOTE_ARGS $RAISE"
-    if [ -z "$REMOTE_SPECIFIED" ];then
-	if [ -z "$URL" ];then
-	    URL=about:blank
-	fi
-	NS_REMOTE_ARGS="$NS_REMOTE_ARGS -remote openURL(${URL})"
-    fi
-    if ns-remote -noraise 2>/dev/null; then
-        if ns-remote $NS_REMOTE_ARGS ; then
-            exit 0
-        fi
-    else
-        echo "Netscape not running. Spawning $NETSCAPE_BIN in background." >&2
-    fi
-fi
-
-if [ -z "$NETSCAPE_BIN" ];then
-    echo "Unable to locate netscape binary for '$NETSCAPE_PREFERRED'"
-    exit 1
-fi
-case $1 in
-    -*)
-	$NETSCAPE_BIN "$@"
-	;;
-    *)
-	# Since using ns-remote will return, we start netscape in the
-	# background to give consistent behaviour.
-	$NETSCAPE_BIN "$@" &
-	;;
-esac
-exit 0
diff --git a/www/ns-remote/patches/patch-aa b/www/ns-remote/patches/patch-aa
deleted file mode 100644
index ca6303e79b9..00000000000
--- a/www/ns-remote/patches/patch-aa
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/08 20:15:14 bad Exp $
-
---- remote.c.orig	2005-03-08 21:09:05.000000000 +0100
-+++ remote.c	2005-03-08 21:09:34.000000000 +0100
-@@ -118,8 +118,12 @@
- 				       &version);
-       if (! version)
- 	continue;
-+#ifdef STANDALONE /* Pick most recent version */
-+      if (! tenative_version || strcmp((char *) version, tenative_version) > 0 )
-+#else
-       if (strcmp ((char *) version, expected_mozilla_version) &&
- 	  !tenative)
-+#endif
- 	{
- 	  tenative = w;
- 	  tenative_version = version;
-@@ -135,22 +139,26 @@
- 
-   if (result && tenative)
-     {
-+#ifndef STANDALONE
-       fprintf (stderr,
- 	       "%s: warning: both version %s (0x%x) and version\n"
- 	       "\t%s (0x%x) are running.  Using version %s.\n",
- 	       progname, tenative_version, (unsigned int) tenative,
- 	       expected_mozilla_version, (unsigned int) result,
- 	       expected_mozilla_version);
-+#endif
-       XFree (tenative_version);
-       return result;
-     }
-   else if (tenative)
-     {
-+#ifndef STANDALONE
-       fprintf (stderr,
- 	       "%s: warning: expected version %s but found version\n"
- 	       "\t%s (0x%x) instead.\n",
- 	       progname, expected_mozilla_version,
- 	       tenative_version, (unsigned int) tenative);
-+#endif
-       XFree (tenative_version);
-       return tenative;
-     }
-@@ -566,7 +574,7 @@
- }
- 
- 
--void
-+int
- main (int argc, char **argv)
- {
-   Display *dpy;
-@@ -676,6 +684,12 @@
- 	    }
- 	}
-     }
-+  if (! remote_commands)
-+    {
-+    fprintf (stderr, "%s: No valid commands given\n", progname);
-+    usage ();
-+    exit (-1);
-+    }
- 
-   dpy = XOpenDisplay (dpy_string);
-   if (! dpy)