diff -Naup motion-3.2.7.orig/Makefile.in motion-3.2.7/Makefile.in
--- motion-3.2.7.orig/Makefile.in	Fri Oct 20 02:21:54 2006
+++ motion-3.2.7/Makefile.in	Tue Nov 21 02:38:34 2006
@@ -40,8 +40,8 @@ OBJ          = motion.o conf.o draw.o $(
 	       alg.o event.o picture.o rotate.o webhttpd.o \
 	       webcam.o @FFMPEG_OBJ@
 SRC          = $(OBJ:.o=.c)
-DOC          = CHANGELOG COPYING CREDITS INSTALL README motion_guide.html
-EXAMPLES     = *.conf motion.init-Debian motion.init-RH motion.init-FreeBSD.sh
+DOC          = CHANGELOG COPYING CREDITS INSTALL README README.FreeBSD motion_guide.html
+EXAMPLES     = *.conf motion.init-FreeBSD.sh
 PROGS        = motion
 DEPEND_FILE  = .depend
 
@@ -134,21 +134,14 @@ dep depend fastdep: $(DEPEND_FILE)
 install:
 	@echo "Installing files..."
 	@echo "--------------------------------------------------------------------------------"
-	mkdir -p $(DESTDIR)$(bindir)
-	mkdir -p $(DESTDIR)$(mandir)/man1
-	mkdir -p $(DESTDIR)$(sysconfdir)
-	mkdir -p $(DESTDIR)$(docdir)
-	mkdir -p $(DESTDIR)$(examplesdir)
 	$(INSTALL) motion.1 $(DESTDIR)$(mandir)/man1
-	$(INSTALL) $(DOC) $(DESTDIR)$(docdir)
-	$(INSTALL) $(EXAMPLES) $(DESTDIR)$(examplesdir)
-	$(INSTALL) motion-dist.conf $(DESTDIR)$(sysconfdir)
+	$(INSTALL) motion-dist.conf $(DESTDIR)$(sysconfdir)/motion.conf.sample
 	for prog in $(PROGS); \
 	do \
 	($(INSTALL) $$prog $(DESTDIR)$(bindir) ); \
 	done
 	@echo "--------------------------------------------------------------------------------"
-	@echo "Install complete! The default configuration file, motion-dist.conf, has been"
+	@echo "Install complete! The default configuration file, motion.conf.sample, has been"
 	@echo "installed to $(sysconfdir). You need to rename/copy it to $(sysconfdir)/motion.conf"
 	@echo "for Motion to find it. More configuration examples as well as init scripts"
 	@echo "can be found in $(examplesdir)."
@@ -165,7 +158,7 @@ uninstall remove: pre-build-info
 		($ rm -f $(bindir)/$$prog ); \
 	done
 	rm -f $(mandir)/man1/motion.1
-	rm -f $(sysconfdir)/motion-dist.conf
+	rm -f $(sysconfdir)/motion.conf.sample
 	rm -rf $(docdir)
 	@echo "--------------------------------------------------------------------------------"
 	@echo "Uninstall complete!"
diff -Naup motion-3.2.7.orig/README.FreeBSD motion-3.2.7/README.FreeBSD
--- motion-3.2.7.orig/README.FreeBSD	Fri Oct 20 02:21:54 2006
+++ motion-3.2.7/README.FreeBSD	Tue Nov 21 02:41:03 2006
@@ -43,15 +43,15 @@ hw.bt848.format=0
 
 Tested in FreeBSD 4.9/4.1x/5.x/6.0 .
 
-Packages needed (dependencies for 6.0):
+Packages needed (dependencies for 6.1):
 
  - autoconf-2.59_2 
  - gcc-3.4.6_20051206 
  - m4-1.4.4 
- - linuxthreads-2.2.3_19 
+ - linuxthreads-2.2.3_19 only if you don't want native freebsd pthread 
  - jpeg-6b_4 or above  
  - gmake-3.80_2 ( GNU Make )
- - ffmpeg-0.4.9.p1_5 ( mpeg1/4 video encoders ).
+ - ffmpeg-0.4.9.p1_6 ( mpeg1/4 video encoders ).
  - mysql-server , mysql-client ( database backend support ).
  - postgresql-devel , postgresql ( database backend support ).
 
diff -Naup motion-3.2.7.orig/configure.in motion-3.2.7/configure.in
--- motion-3.2.7.orig/configure.in	Fri Oct 20 02:21:53 2006
+++ motion-3.2.7/configure.in	Tue Nov 21 02:43:13 2006
@@ -558,16 +558,6 @@ else
 fi
 
 
-OPTIMIZECPU="yes"
-
-AC_ARG_WITH(optimizecpu,
-[  --without-optimizecpu   Exclude autodetecting platform and cpu type.
-                          This will disable the compilation of gcc
-                          optimizing code by platform and cpu.
-			  ],
-OPTIMIZECPU="$withval"
-)
-
 DEVELOPER_FLAGS="no"
 
 AC_ARG_WITH(developer-flags,
@@ -580,199 +570,7 @@ DEVELOPER_FLAGS="$withval"
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-if test "${FreeBSD}" != ""; then
-	OPTIMIZECPU=""
-fi
-
-if test "${OPTIMIZECPU}" = "yes"; then
-
-dnl Try to autodetect cpu type
-CPU_NAME="unknown"
-CPU_TYPE="unknown"
-if test -e "/proc/cpuinfo" ; then
-	intel[[30]]="-march=i386"
-	intel[[32]]="-march=i386"
-	intel[[34]]="-march=i386"
-	intel[[40]]="-march=i486"
-	intel[[41]]="-march=i486"
-	intel[[42]]="-march=i486"
-	intel[[43]]="-march=i486"
-	intel[[44]]="-march=i486"
-	intel[[45]]="-march=i486"
-	intel[[47]]="-march=i486"
-	intel[[48]]="-march=i486"
-	intel[[51]]="-march=pentium"
-	intel[[52]]="-march=pentium"
-	intel[[54]]="-march=pentium-mmx"
-	intel[[61]]="-march=pentiumpro"
-	intel[[63]]="-march=pentium2"
-	intel[[65]]="-march=pentium2"
-	intel[[66]]="-march=pentium2"
-	intel[[67]]="-march=pentium3"
-	intel[[68]]="-march=pentium3"
-	intel[[610]]="-march=pentium3"
-	intel[[611]]="-march=pentium3"
-	intel[[150]]="-march=pentium4"
-	intel[[151]]="-march=pentium4"
-	intel[[152]]="-march=pentium4"
-	amd[[50]]="-march=i586"
-	amd[[51]]="-march=i586"
-	amd[[52]]="-march=i586"
-	amd[[53]]="-march=i586"
-	amd[[56]]="-march=k6"
-	amd[[57]]="-march=k6"
-	amd[[58]]="-march=k6-2"
-	amd[[59]]="-march=k6-3"
-	amd[[61]]="-march=athlon"
-	amd[[62]]="-march=athlon"
-	amd[[63]]="-march=athlon"
-	amd[[64]]="-march=athlon"
-	amd[[66]]="-march=athlon"
-	amd[[67]]="-march=athlon"
-	amd[[68]]="-march=athlon"
-	amd[[155]]="-march=athlon64"
-	CPU_TYPE="known"
-	CPU_FAMILY=`cat /proc/cpuinfo | grep "cpu family" | head -n1`
-	CPU_MODEL=`cat /proc/cpuinfo | grep model[[^\ ]] | head -n1`
-	CPU_NAME=`cat /proc/cpuinfo | grep "model name" | head -n1`
-	CPU_FLAGS=`cat /proc/cpuinfo | grep "flags" | head -n1`
-	CPU_VENDOR=`cat /proc/cpuinfo | grep "vendor_id" | head -n1`
-	CPU_FAMILY=${CPU_FAMILY#*: }
-	CPU_MODEL=${CPU_MODEL#*: }
-	CPU_NAME=${CPU_NAME#*: }
-	CPU_FLAGS=${CPU_FLAGS#*: }
-	CPU_VENDOR=${CPU_VENDOR#*: }
-	if test "x${CPU_VENDOR}" = "xGenuineIntel" ; then
-		CPU_OPTIONS=${intel[[$CPU_FAMILY$CPU_MODEL]]}
-	fi
-	if test "x${CPU_VENDOR}" = "xAuthenticAMD" ; then
-		CPU_OPTIONS=${amd[[$CPU_FAMILY$CPU_MODEL]]}
-	fi
-	if test "x${CPU_OPTIONS}" = "x" ; then
-		CPU_TYPE="unknown"
-	fi
-	CPU_EXT=""
-	for i in $CPU_FLAGS ; do
-		case $i in
-		fpu)
-			CPU_FPU="-mfpmath=387"
-			;;
-		mmx)
-			CPU_EXT="$CPU_EXT -mmmx"
-			;;
-		sse)
-			CPU_FPU="-mfpmath=sse -msse"
-			;;
-		sse2)
-			CPU_FPU="-mfpmath=sse -msse2"
-			;;
-		3dnow)
-			CPU_EXT="$CPU_EXT -m3dnow"
-			;;
-		esac
-	done
-	CPU_OPTIONS="$CPU_OPTIONS $CPU_FPU $CPU_EXT"
-fi
-if test "x${CPU_TYPE}" = "xunknown"; then
-	CPU_TYPE=`( uname -p ) 2>&1`
-	case $CPU_TYPE in
-	i386)
-		CPU_OPTIONS="-march=i386"
-		;;
-	i486)
-		CPU_OPTIONS="-march=i486"
-		;;
-	Pentium2)
-		CPU_OPTIONS="-march=pentium2"
-		;;
-	Pentiumpro)
-		CPU_OPTIONS="-march=pentiumpro"
-		;;
-	Pentium*)
-		CPU_OPTIONS="-march=pentium"
-		;;
-	k6)
-		CPU_OPTIONS="-march=k6"
-		;;
-	k6-2)
-		CPU_OPTIONS="-march=k6-2"
-		;;
-	k6-3)
-		CPU_OPTIONS="-march=k6-3"
-		;;
-	"VIA C3 Ezra")
-		CPU_OPTIONS="-march=c3"
-		CPU_TYPE="known"
-               ;;
-	*)
-		CPU_OPTIONS=""
-		CPU_TYPE="unknown"
-		;;
-	esac
-	if test "x${CPU_TYPE}" = "xunknown"; then
-		CPU_TYPE=`( uname -m ) 2>&1`
-		case $CPU_TYPE in
-		i386)
-			CPU_OPTIONS="-march=i386"
-			;;
-		i486)
-			CPU_OPTIONS="-march=i486"
-			;;
-		i586)
-			CPU_OPTIONS="-march=i586"
-			;;
-		i686)
-			CPU_OPTIONS="-march=i686"
-			;;
-		Pentium2)
-			CPU_OPTIONS="-march=pentium2"
-			;;
-		Pentiumpro)
-			CPU_OPTIONS="-march=pentiumpro"
-			;;
-		k6)
-			CPU_OPTIONS="-march=k6"
-			;;
-		k6-2)
-			CPU_OPTIONS="-march=k6-2"
-			;;
-		k6-3)
-			CPU_OPTIONS="-march=k6-3"
-			;;
-		*)
-			CPU_OPTIONS=""
-			;;
-		esac
-	fi
-fi
-echo "Detected CPU: $CPU_NAME"
-dnl Now we check if the compiler supports the detected cpu
-COMPILER=$CC
-for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
-	test "$I" && break
-done
-TMPC="$I/cpu_test-$RANDOM-$$.c"
-TMPO="$I/cpu_test-$RANDOM-$$.o"
-cat > $TMPC << EOF
-int main(void) { return 0; }
-EOF
-( $COMPILER $CPU_OPTIONS -o $TMPO $TMPC ) 2>&1
-TMP="$?"
-rm -f $TMPO
-rm -f $TMPC
-
-
-if test "x${TMP}" = "x1" ; then
-	CPU_OPTIONS=""
-	echo "No CPU optimizations will be added"
-else
-	echo "CPU optimization: $CPU_OPTIONS"
-fi
-
-else
-	CPU_OPTIONS=""
-fi
-
+CPU_OPTIONS=""
 
 AC_MSG_CHECKING(for bswap instruction)
 AC_LINK_IFELSE([
@@ -821,9 +619,6 @@ AC_SUBST(BIN_PATH)
 
 AC_OUTPUT(
 motion.init-FreeBSD.sh
-motion.init-Debian
-motion.init-RH
-motion.spec
 Makefile
 )
 
Common subdirectories: motion-3.2.7.orig/debian and motion-3.2.7/debian
diff -Naup motion-3.2.7.orig/motion-dist.conf motion-3.2.7/motion-dist.conf
--- motion-3.2.7.orig/motion-dist.conf	Fri Oct 20 02:21:54 2006
+++ motion-3.2.7/motion-dist.conf	Tue Nov 21 02:45:43 2006
@@ -8,7 +8,7 @@
 ############################################################
 
 # Start in daemon (background) mode and release terminal (default: off)
-daemon on
+daemon off
 
 # File to store the process ID, also called pid file. (default: not defined)
 process_id_file /var/run/motion.pid 
@@ -26,7 +26,7 @@ setup_mode off
 
 # Videodevice to be used for capturing  (default /dev/video0)
 # for FreeBSD default is /dev/bktr0
-videodevice /dev/video0
+videodevice /dev/bktr0
 
 # Tuner device to be used for capturing using tuner as source (default /dev/tuner0)
 # This is ONLY used for FreeBSD. Leave it commented out for Linux
@@ -34,7 +34,7 @@ videodevice /dev/video0
 
 # The video input to be used (default: 8)
 # Should normally be set to 1 for video/TV cards, and 8 for USB cameras
-input 8
+input 1 
 
 # The video norm to use (only for video capture and TV tuner cards)
 # Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL)