From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 20 16:27:40 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BC656C93;
 Sun, 20 Jan 2013 16:27:40 +0000 (UTC)
 (envelope-from mandree@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 95087A77;
 Sun, 20 Jan 2013 16:27:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KGReaO034407;
 Sun, 20 Jan 2013 16:27:40 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KGReK2034406;
 Sun, 20 Jan 2013 16:27:40 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201301201627.r0KGReK2034406@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 20 Jan 2013 16:27:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310700 - head/news/newsstar
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jan 2013 16:27:40 -0000

Author: mandree
Date: Sun Jan 20 16:27:40 2013
New Revision: 310700
URL: http://svnweb.freebsd.org/changeset/ports/310700

Log:
  Convert to OptionsNG.
  
  Fix an installation error to fresh PREFIX directories, where a file was
  installed one directory level too close to the root (lib/newsstar) and
  renamed.

Modified:
  head/news/newsstar/Makefile   (contents, props changed)

Modified: head/news/newsstar/Makefile
==============================================================================
--- head/news/newsstar/Makefile	Sun Jan 20 16:17:34 2013	(r310699)
+++ head/news/newsstar/Makefile	Sun Jan 20 16:27:40 2013	(r310700)
@@ -3,6 +3,7 @@
 
 PORTNAME=	newsstar
 PORTVERSION=	1.5.5
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	SF
 
@@ -11,7 +12,7 @@ COMMENT=	Transfer news between a local N
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 
@@ -20,6 +21,9 @@ GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS_DEFINE=		SSL
+OPTIONS_DEFAULT=	SSL
+
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-conf-dir=${PREFIX}/etc/newsstar \
 		--with-rc-dir=/var/spool/newsstar/lib \
@@ -28,14 +32,16 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-.if defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-am
 .endif
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--disable-ssl
-.else
+.if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
+.else
+CONFIGURE_ARGS+=--disable-ssl
 .endif
 
 .include <bsd.port.pre.mk>
@@ -65,14 +71,17 @@ DOCS=		AUTHORS INSTALL NEWS README TODO 
 EX_CONFIGS=	cf.server.sample curses.cf.sample filter.pl.sample main.cf.sample \
 		master.ignore.sample master.score.sample newsrc.sample
 
+pre-install:
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}
+
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 .for i in ${EX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample_config/${i} ${EXAMPLESDIR}
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}