Index: nocatsplash/Makefile
===================================================================
--- nocatsplash/Makefile	(revision 376464)
+++ nocatsplash/Makefile	(working copy)
@@ -6,17 +6,17 @@
 PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://farrokhi.net/distfiles/ \
-		http://nocat.net/download/NoCatSplash/
+		http://BSDforge.com/projects/source/net/nocatsplash/
 DISTNAME=	NoCatSplash-nightly
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Open 802.11 Splash Screen
 
-BROKEN=		Broken pkg-install script, should use USERS and UIDs
+LICENSE=	GPLv2
 
 USE_GNOME=	glib12
 
-CONFLICTS=	nocatauth-server-*
+CONFLICTS=	nocatauth-server-[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		gmake tar:tgz
Index: nocatsplash/files/patch-mkinstalldirs
===================================================================
--- nocatsplash/files/patch-mkinstalldirs	(revision 0)
+++ nocatsplash/files/patch-mkinstalldirs	(working copy)
@@ -0,0 +1,28 @@
+--- mkinstalldirs.orig	2015-02-09 08:47:12.000000000 -0800
++++ mkinstalldirs	2015-02-09 08:47:48.000000000 -0800
+@@ -7,25 +7,6 @@
+ 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 ;;
+-     -- ) shift; break ;;			# stop option processing
+-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+-     * )  break ;;				# first non-opt arg
+-   esac
+-done
+-
+ for file
+ do
+   if test -d "$file"; then

Property changes on: nocatsplash/files/patch-mkinstalldirs
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
Index: nocatsplash/pkg-descr
===================================================================
--- nocatsplash/pkg-descr	(revision 376464)
+++ nocatsplash/pkg-descr	(working copy)
@@ -1,5 +1,5 @@
-NoCatSplash is a Open Public Network Gateway Daemon.  It performs as a
-[captive/open/active] portal.  When run on a gateway/router on a network,
+NoCatSplash is a Open Public Network Gateway Daemon. It performs as a
+[captive/open/active] portal. When run on a gateway/router on a network,
 all web requests are redirected until the client either logs in or clicks
 "I Accept" to an AUP. The gateway daemon then changes the firewall rules
 on the gateway to pass traffic for that client (based on IP address and
Index: nocatsplash/pkg-install
===================================================================
--- nocatsplash/pkg-install	(revision 376464)
+++ nocatsplash/pkg-install	(working copy)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-if [ -z "${WRAP_USER}" ]; then
-	WRAP_USER=nocat
-fi
-
-case $2 in
-    PRE-INSTALL)
-	UID=181
-	GID=${UID}
-	if [ ! -d "${NOCAT_DIR}" ]; then
-		mkdir -p ${NOCAT_DIR}
-	fi
-	if pw user show "${WRAP_USER}" 2>/dev/null; then
-		echo "You already have a user \"${WRAP_USER}\", so I will use it."
-		if pw usermod ${WRAP_USER} -d ${NOCAT_DIR}
-		then
-			echo "Changed home directory of \"${WRAP_USER}\" to \"${NOCAT_DIR}\""
-		else
-			"${NOCAT_DIR}\" failed..."
-			exit 1
-		fi
-		else
-		if pw useradd ${WRAP_USER} -u ${UID} \
-			-d ${NOCAT_DIR} -s /sbin/nologin -c "NoCat Daemon"
-		then
-			echo "Added user \"${WRAP_USER}\"."
-		else
-			echo "Adding user \"${WRAP_USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac
Index: nocatsplash/pkg-plist
===================================================================
--- nocatsplash/pkg-plist	(revision 376464)
+++ nocatsplash/pkg-plist	(working copy)
@@ -12,3 +12,6 @@
 sbin/splashd
 sbin/ghttpd
 etc/nocat.conf
+@dir libexec/nocat
+@exec if ! pw groupshow nocat 2>/dev/null; then pw groupadd nocat -g 181; fi
+@exec if ! pw usershow nocat 2>/dev/null; then pw useradd nocat -g nocat -u 181 -h - -d /libexec/nocat -s /sbin/nologin -c "NoCat Daemon"; fi