Add back stuff merged earlier:

Shorewall-lite/install.sh

@@ -131,6 +131,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 #
 DEBIAN=
 CYGWIN=
+INSTALLD='-D'
 
 case $(uname) in
     CYGWIN*)
@@ -142,6 +143,9 @@ case $(uname) in
 	OWNER=$(id -un)
 	GROUP=$(id -gn)
 	;;
+    Darwin)
+	INSTALLD=
+	;;	   
     *)
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=root
@@ -300,15 +304,17 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules"
 
 cd manpages
 
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/
+
 for f in *.5; do
     gzip -c $f > $f.gz
-    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+    run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
 done
 
 for f in *.8; do
     gzip -c $f > $f.gz
-    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+    run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
 done
 

Shorewall/install.sh

@@ -112,6 +112,7 @@ CYGWIN=
 MAC=
 SPARSE=
 MANDIR=${MANDIR:-"/usr/share/man"}
+INSTALLD='-D'
 
 case $(uname) in
     CYGWIN*)
@@ -129,12 +130,13 @@ case $(uname) in
 	if [ -z "$PREFIX" ]; then
 	    DEST=
 	    INIT=
+	    SPARSE=Yes
 	fi
 
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=wheel
 	MAC=Yes
-	SPARSE=Yes
+	INSTALLD=
 	;;	
     *)
 	[ -z "$OWNER" ] && OWNER=root
@@ -834,15 +836,17 @@ fi
 
 cd manpages
 
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/
+
 for f in *.5; do
     gzip -c $f > $f.gz
-    run_install -D  -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
+    run_install $INSTALLD  -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz"
 done
 
 for f in *.8; do
     gzip -c $f > $f.gz
-    run_install -D  -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
+    run_install $INSTALLD  -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz"
 done
 

Shorewall6-lite/install.sh

@@ -130,6 +130,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 # Determine where to install the firewall script
 #
 DEBIAN=
+INSTALLD='-D'
 
 case $(uname) in
     CYGWIN*)
@@ -141,6 +142,9 @@ case $(uname) in
 	OWNER=$(id -un)
 	GROUP=$(id -gn)
 	;;
+     Darwin)
+	INSTALLD=
+	;;	   
     *)
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=root
@@ -299,15 +303,17 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall6-lite/modules"
 
 cd manpages
 
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}/usr/share/man/man5/ ${PREFIX}/usr/share/man/man8/
+
 for f in *.5; do
     gzip -c $f > $f.gz
-    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+    run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
 done
 
 for f in *.8; do
     gzip -c $f > $f.gz
-    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+    run_install $INSTALLD -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
 done
 

Shorewall6/install.sh

@@ -112,6 +112,7 @@ CYGWIN=
 MAC=
 MANDIR=${MANDIR:-"/usr/share/man"}
 SPARSE=
+INSTALLD='-D'
 
 case $(uname) in
     CYGWIN*)
@@ -129,12 +130,13 @@ case $(uname) in
 	if [ -z "$PREFIX" ]; then
 	    DEST=
 	    INIT=
+	    SPARSE=Yes
 	fi
 
 	[ -z "$OWNER" ] && OWNER=root
 	[ -z "$GROUP" ] && GROUP=wheel
 	MAC=Yes
-	SPARSE=Yes
+	INSTALLD=
 	;;	
     *)
 	[ -z "$OWNER" ] && OWNER=root
@@ -693,15 +695,17 @@ fi
 
 cd manpages
 
+[ -n "$INSTALLD" ] || mkdir -p ${PREFIX}${MANDIR}/man5/ ${PREFIX}${MANDIR}/man8/
+
 for f in *.5; do
     gzip -c $f > $f.gz
-    run_install -D  -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
+    run_install $INSTALLD  -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz"
 done
 
 for f in *.8; do
     gzip -c $f > $f.gz
-    run_install -D  -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
+    run_install $INSTALLD  -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
     echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz"
 done
 

docs/shorewall_setup_guide.xml

@@ -363,7 +363,7 @@ all              all                 REJECT     info</programlisting>
     class="devicefile">ppp0</filename> or <filename
     class="devicefile">ippp0</filename> then you will want to set CLAMPMSS=yes
     in <filename><ulink
-    url="manpages/shorewall.conf.htmlig">/etc/shorewall/shorewall.conf</ulink></filename>.</para>
+    url="manpages/shorewall.conf.html">/etc/shorewall/shorewall.conf</ulink></filename>.</para>
 
     <para>Your <emphasis>Local Interface</emphasis> will be an Ethernet
     adapter (<filename class="devicefile">eth0</filename>,

manpages/shorewall.conf.xml

@@ -59,7 +59,7 @@
 
     <para>For most Shorewall logging, a level of 6 (info) is appropriate.
     Shorewall log messages are generated by NetFilter and are logged using
-    facility 'kern' and the level that you specifify. If you are unsure of the
+    facility 'kern' and the level that you specify. If you are unsure of the
     level to choose, 6 (info) is a safe bet. You may specify levels by name or
     by number.</para>