diff -urN /usr/ports/sysutils/am-utils/Makefile sysutils/am-utils/Makefile
--- /usr/ports/sysutils/am-utils/Makefile	2010-12-04 16:33:33.000000000 +0900
+++ sysutils/am-utils/Makefile	2012-10-03 03:58:24.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   am-utils
-# Date created:        2 November 2004
-# Whom:                Jon Wilson <jon@phuq.co.uk>
-#
+# Created by: Jon Wilson <jon@phuq.co.uk>
 # $FreeBSD: ports/sysutils/am-utils/Makefile,v 1.13 2010/12/04 07:33:33 ade Exp $
-#
 
 PORTNAME=	am-utils
 PORTVERSION=	6.1.5
@@ -11,31 +7,44 @@
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
 		ftp://ftp.cs.umn.edu/pub/am-utils/ \
-		ftp://ftp.cise.ufl.edu/pub/mirrors/am-utils/ \
-		ftp://sunsite.org.uk/package/am-utils/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/
+		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/ \
+		RINGSERVER/net/am-utils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
 
-USE_LDCONFIG=	yes
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+OPTIONS_DEFINE=	OPENLDAP DOCS
+OPTIONS_DEFAULT=OPENLDAP
+OPENLDAP_DESC=	OpenLDAP support
+
 USE_AUTOTOOLS=	libtool
+USE_LDCONFIG=	yes
+MAKE_JOBS_UNSAFE=yes
+
+MAN1=		expn.1 pawd.1
+MAN5=		amd.conf.5
+MAN8=		amd.8 amq.8 automount2amd.8 fixmount.8 fsinfo.8 hlfsd.8 \
+		mk-amd-map.8 wire-test.8
+INFO=		am-utils
+PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
-PORTDOCS=	AUTHORS BUGS COPYING FAQ NEWS README.attrcache
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENLDAP) || defined(PACKAGE_BUILDING)
+.if ${PORT_OPTIONS:MOPENLDAP}
 USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--with-ldap=yes --enable-ldflags=-L${LOCALBASE}/lib --enable-cppflags=-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-ldap=yes \
+		--enable-ldflags=-L${LOCALBASE}/lib \
+		--enable-cppflags=-I${LOCALBASE}/include
 PORTDOCS+=	README.ldap ldap-id.txt ldap.schema
+.else
+CONFIGURE_ARGS+=--with-ldap=no
 .endif
 
-INFO=		am-utils
-MAN1=		expn.1 pawd.1
-MAN5=		amd.conf.5
-MAN8=		amd.8 amq.8 automount2amd.8 fixmount.8 fsinfo.8 hlfsd.8 mk-amd-map.8 wire-test.8
-
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif