Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jan 2013 16:27:40 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310700 - head/news/newsstar
Message-ID:  <201301201627.r0KGReK2034406@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301201627.r0KGReK2034406>