svn commit: r323816 - head/net/freewais-sf

[Alexey Dokuchaev]

Author: danfe
Date: Sun Jul 28 09:22:46 2013
New Revision: 323816
URL: http://svnweb.freebsd.org/changeset/ports/323816

Log:
  - Tighten Makefile header and COMMENT
  - Unbreak parallel (-jX) and Clang builds
  - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS
  - Fix bogus double spaces in pkg-descr
  
  Reported by:	pointyhat-west

Modified:
  head/net/freewais-sf/Makefile
  head/net/freewais-sf/pkg-descr

Modified: head/net/freewais-sf/Makefile
==============================================================================
--- head/net/freewais-sf/Makefile	Sun Jul 28 08:45:58 2013	(r323815)
+++ head/net/freewais-sf/Makefile	Sun Jul 28 09:22:46 2013	(r323816)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	FreeWAIS-sf
-# Date created:		19 November 1996
-# Whom:			Pedro Giffuni
-#
+# Created by: Pedro Giffuni <pgiffuni at fps.biblos.unal.edu.co>
 # $FreeBSD$
-#
 
 PORTNAME=	freewais-sf
 PORTVERSION=	2.2.14
@@ -14,7 +10,7 @@ MASTER_SITES=	ftp://ftp.ntua.gr/pub/net/
 DISTNAME=	freeWAIS-sf-${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	An enhanced Wide Area Information Server
+COMMENT=	Enhanced Wide Area Information Server
 
 HAS_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
@@ -24,10 +20,14 @@ CONFIGURE_ARGS=	-sde -Dprefix="${PREFIX}
 		-Darchname="${MACHINE_ARCH}-freebsd"
 INSTALL_TARGET=	install install.man
 
+CFLAGS+=	-Wno-return-type	# to pacify Clang
+
 PORTDOCS=	fwsf.ps
-MAN1=	catalog.1 dictionary.1 inverted_file.1 mkfmt.1 waisindex.1 \
-	waisq.1 waissearch.1 waisserver.1 xwais.1 xwaisq.1
-MAN3=	ftw.3 regexp.3 scandir.3
+MAN1=		catalog.1 dictionary.1 inverted_file.1 mkfmt.1 waisindex.1 \
+		waisq.1 waissearch.1 waisserver.1 xwais.1 xwaisq.1
+MAN3=		ftw.3 regexp.3 scandir.3
+
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
@@ -38,8 +38,13 @@ BROKEN=		Does not install on powerpc: dr
 post-extract:
 	${CP} ${FILESDIR}/freebsd.sh ${WRKSRC}/hints
 
+# Try to fix parallel builds (-jX)
+post-patch:
+	@${REINPLACE_CMD} -e '/$$(RM) $$@/,+1d' \
+		${WRKSRC}/lib/ctype/Makefile.SH
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/SF/${PORTDOCS} ${DOCSDIR}
 .endif

Modified: head/net/freewais-sf/pkg-descr
==============================================================================
--- head/net/freewais-sf/pkg-descr	Sun Jul 28 08:45:58 2013	(r323815)
+++ head/net/freewais-sf/pkg-descr	Sun Jul 28 09:22:46 2013	(r323816)
@@ -1,7 +1,7 @@
 FreeWAIS-sf is an extension of the freeWAIS software provided by the
-Clearinghouse for Networked Information Discovery and  Retrieval (CNIDR). 
-The SF suffix in the software name stands for  "structured fields," an 
-indexing  and search feature which  distinguishes this software from its 
+Clearinghouse for Networked Information Discovery and Retrieval (CNIDR).
+The SF suffix in the software name stands for "structured fields," an
+indexing and search feature which distinguishes this software from its
 predecessors.
 
 For Year 2000 problems, you may try the patches at