From owner-svn-ports-head@FreeBSD.ORG  Thu Jun  6 22:03:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E3E8BA68;
 Thu,  6 Jun 2013 22:03:35 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D671117EB;
 Thu,  6 Jun 2013 22:03:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r56M3Z2H020771;
 Thu, 6 Jun 2013 22:03:35 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r56M3ZIS020770;
 Thu, 6 Jun 2013 22:03:35 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306062203.r56M3ZIS020770@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 6 Jun 2013 22:03:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320132 - head/net/samba36
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jun 2013 22:03:36 -0000

Author: bapt
Date: Thu Jun  6 22:03:35 2013
New Revision: 320132
URL: http://svnweb.freebsd.org/changeset/ports/320132

Log:
  Finish conversion to new options framework
  While here remove check for unsupported versions

Modified:
  head/net/samba36/Makefile

Modified: head/net/samba36/Makefile
==============================================================================
--- head/net/samba36/Makefile	Thu Jun  6 22:03:20 2013	(r320131)
+++ head/net/samba36/Makefile	Thu Jun  6 22:03:35 2013	(r320132)
@@ -124,10 +124,6 @@ WINBIND_DESC=		WinBIND support
 
 .include <bsd.port.options.mk>
 
-# XXX
-.if ${OSVERSION} >= 701000 && ${OSVERSION} < 702000
-IGNORE=			databases/tdb crashes on FreeBSD 7.1. Please, consider upgrading to 7.2 or higher
-.endif
 # There are reports that on ARM PIE makes binaries to core dump(#149186)
 .if ${ARCH} == "arm"
 CONFIGURE_ARGS+=	--disable-pie
@@ -465,13 +461,6 @@ INSTALL_TARGET=	installservers installbi
 INSTALL_TARGET+=installswat
 .endif
 
-.if defined(OPTIONS)
-pre-fetch:
-	@${ECHO_MSG} "===>  -------------------------------------------"
-	@${ECHO_MSG} "===>  Run 'make config' to (re)configure the port"
-	@${ECHO_MSG} "===>  -------------------------------------------"
-.endif
-
 pre-configure:
 	@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
 	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
@@ -484,7 +473,7 @@ post-configure:
 pre-install:
 	-@${FIND} "${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
 	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
-.if !defined(WITHOUT_SWAT)
+.if ${PORT_OPTIONS:MSWAT}
 	@${CAT} ${PKGDIR}/pkg-plist.swat >> ${PLIST}
 .endif