diff --git a/databases/db/Makefile b/databases/db/Makefile
index edbc3f8f9d5..1e3265f125f 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,18 +1,24 @@
-# $OpenBSD: Makefile,v 1.12 2000/01/31 15:07:03 kevlo Exp $
+# $OpenBSD: Makefile,v 1.13 2000/02/02 18:18:41 brad Exp $
 
 DISTNAME=	db-3.0.55
 CATEGORIES=	databases
+MASTER_SITES=	http://www.sleepycat.com/update/3.0.55/
 
 MAINTAINER=	tacho@openbsd.org
 
-MASTER_SITES=	http://www.sleepycat.com/update/3.0.55/
+GNU_CONFIGURE=	yes
+CONFIGURE_SCRIPT=../dist/configure
+CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx 
 
-GNU_CONFIGURE=	YES
-CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_ARGS=		--host=${ARCH}-unknown-openbsd --prefix=${PREFIX} \
-			--enable-compat185 --enable-dump185 --enable-cxx 
+.if defined(USE_JAVA) && ${USE_JAVA:U} == YES
+CONFIGURE_ARGS+= --enable-java
+.endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
+IS_INTERACTIVE=	yes
+
+NO_PACKAGE=	"interactive port"
+
+WRKSRC=	${WRKDIR}/${DISTNAME}/build_unix
 
 EXAMPLES_C=	README ex_access.c ex_btrec.c ex_env.c ex_lock.c \
 		ex_mpool.c ex_thread.c ex_tpcb.c ex_tpcb.h
@@ -21,34 +27,27 @@ EXAMPLES_CPP=	AccessExample.cpp BtRecExample.cpp EnvExample.cpp \
 EXAMPLES_JAVA=  AccessExample.java BtRecExample.java EnvExample.java \
 		LockExample.java TpcbExample.java
 
-IS_INTERACTIVE=		yes
-NO_PACKAGE=		interactive port
-
 post-install:
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/db
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/db
+	@mv ${PREFIX}/docs/* ${PREFIX}/share/doc/db
 	@mv ${PREFIX}/include/db.h ${PREFIX}/include/db3.h
-	@${MKDIR} ${PREFIX}/share/doc/db
-	@${MV} ${PREFIX}/docs/* ${PREFIX}/share/doc/db
-	@${RMDIR} ${PREFIX}/docs
-	@${MKDIR} ${PREFIX}/share/examples/db
-	@echo Installing samples: ${PREFIX}/share/examples/db ...
-.for example in ${EXAMPLES_C}
-	@${INSTALL_DATA} ${WRKSRC}/../examples_c/${example} \
+	@rmdir ${PREFIX}/docs
+	@echo "Installing samples: ${PREFIX}/share/examples/db ..."
+	@cd ${WRKSRC}/../examples_c; ${INSTALL_DATA} ${EXAMPLES_C} \
 		${PREFIX}/share/examples/db
-.endfor
-.for example in ${EXAMPLES_CPP}
-	@${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} \
+	@cd ${WRKSRC}/../examples_cxx; ${INSTALL_DATA} ${EXAMPLES_CPP} \
 		${PREFIX}/share/examples/db
-.endfor
-.for example in ${EXAMPLES_JAVA}
-	@${INSTALL_DATA} ${WRKSRC}/../examples_java/${example} \
+	@cd ${WRKSRC}/../examples_java; ${INSTALL_DATA} ${EXAMPLES_JAVA} \
 		${PREFIX}/share/examples/db
-.endfor
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default,"
-	@${ECHO_MSG} "and requires that you have a work working copy of the"
-	@${ECHO_MSG} "JDK installed."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "To build java support, please add \"--enable-java\""
-	@${ECHO_MSG} "in CONFIGURE_ARGS, thaks."
+	@echo ""
+	@echo "Java support for ${PKGNAME} is *NOT* built by default,"
+	@echo "and requires that you have a working copy of the JDK"
+	@echo "installed."
+	@echo ""
+	@echo "To build Java support, use the \"USE_JAVA=yes\" option"
+	@echo "on the make command line."
+	@echo "For example: \"make USE_JAVA=yes\""
+	@echo ""
 
 .include <bsd.port.mk>