Index: bin/cygport.in
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/bin/cygport.in,v
retrieving revision 1.109
diff -u -r1.109 cygport.in
--- bin/cygport.in	4 May 2008 06:51:03 -0000	1.109
+++ bin/cygport.in	4 May 2008 19:33:16 -0000
@@ -1754,7 +1770,7 @@
 	local difflevel;
 	local exclude;
 
-	default_excludes="CYGWIN-PATCHES aclocal.m4* autom4te.cache \
+	default_excludes="CYGWIN-PATCHES aclocal.m4~ aclocal.m4t autom4te.cache \
 		config.cache config.log config.status config.h config.h.in
 		ABOUT-NLS Makefile.in.in Makevars.template *SlackBuild* *.egg-info \
 		*.class *.pyc *.mo *.gmo *.orig *.rej *.spec *.temp *~ *.stackdump";
@@ -1773,6 +1789,15 @@
 		*)	default_excludes+=" config.rpath" ;;
 	esac
 
+	# exclude aclocal.m4 if generated from aclocal
+	if [ -f ${S}/aclocal.m4 ]
+	then
+		if $(head -n 1 ${S}/aclocal.m4 | grep -q 'generated.* by aclocal')
+		then
+			default_excludes+=" aclocal.m4";
+		fi
+	fi
+
 	# exclude Makefile.in only if using automake
 	for mf in Makefile GNUmakefile makefile
 	do
Index: lib/berkdb.cygclass
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/lib/berkdb.cygclass,v
retrieving revision 1.10
diff -u -r1.10 berkdb.cygclass
--- lib/berkdb.cygclass	16 Apr 2008 00:16:56 -0000	1.10
+++ lib/berkdb.cygclass	4 May 2008 19:33:16 -0000
@@ -53,7 +53,7 @@
 PKG_CONTENTS[3]="etc/p*/java-${PN}.sh usr/bin/cygdb_java-${SLOT}.dll ${JAVA_DIR#/}"
 PKG_CONTENTS[4]="${TCL_LIBDIR#/}"
 
-DIFF_EXCLUDES="configure config.hin db.jar libtool.ac lt*.ac"
+DIFF_EXCLUDES="aclocal.m4 configure config.hin db.jar libtool.ac lt*.ac"
 
 # At a minimum, the following must be changed:
 # * chmod +w dist/Makefile.in dist/aclocal/tcl.ac dist/configure.ac

