From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 22:33:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E9A55A2; Wed, 27 Nov 2013 22:33:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1DDD82009; Wed, 27 Nov 2013 22:33:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARMXQiJ071409; Wed, 27 Nov 2013 22:33:26 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARMXQew071406; Wed, 27 Nov 2013 22:33:26 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201311272233.rARMXQew071406@svn.freebsd.org> From: Thierry Thomas Date: Wed, 27 Nov 2013 22:33:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335070 - in head/news/newsx: . files 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.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Nov 2013 22:33:27 -0000 Author: thierry Date: Wed Nov 27 22:33:26 2013 New Revision: 335070 URL: http://svnweb.freebsd.org/changeset/ports/335070 Log: - Chase the update of INN; - Stagify. Modified: head/news/newsx/Makefile (contents, props changed) head/news/newsx/files/patch-configure (contents, props changed) head/news/newsx/pkg-plist (contents, props changed) Modified: head/news/newsx/Makefile ============================================================================== --- head/news/newsx/Makefile Wed Nov 27 22:11:46 2013 (r335069) +++ head/news/newsx/Makefile Wed Nov 27 22:33:26 2013 (r335070) @@ -3,7 +3,7 @@ PORTNAME= newsx PORTVERSION= 1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= news MASTER_SITES= http://www.kvaleberg.org/pub/ @@ -18,10 +18,6 @@ BUILD_DEPENDS= ${LOCALBASE}/news/lib/lib BUILD_DEPENDS= ${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn .endif -.if defined(PACKAGE_BUILDING) -IGNORE= a configured INN is required -.endif - GNU_CONFIGURE= yes CONFLICTS= leafnode-1.* @@ -38,11 +34,8 @@ CONFIGURE_ARGS+= --without-history DOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/configure - pre-configure: + ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/configure @${ECHO} "*********************************************************" @${ECHO} "If the configure step fails, then you probably don't have" @${ECHO} "a news server package installed. Try installing INN from" @@ -50,20 +43,19 @@ pre-configure: @${ECHO} "again." @${ECHO} "*********************************************************" -pre-install: - @${STRIP_CMD} ${WRKSRC}/src/newsx +post-build: +.if !defined(WITH_DEBUG) + ${STRIP_CMD} ${WRKSRC}/src/newsx +.endif post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/inhosts .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO} "Documentation installed in ${DOCSDIR}." .endif -MAN1= newsq.1 -MAN5= newsx.conf.5 in.hosts.5 -MAN8= newsx.8 - .include Modified: head/news/newsx/files/patch-configure ============================================================================== --- head/news/newsx/files/patch-configure Wed Nov 27 22:11:46 2013 (r335069) +++ head/news/newsx/files/patch-configure Wed Nov 27 22:33:26 2013 (r335070) @@ -1,5 +1,5 @@ ---- configure.orig Sun May 18 19:25:34 2003 -+++ configure Sun May 18 23:45:15 2003 +--- configure.orig 2003-05-18 19:25:34.000000000 +0200 ++++ configure 2013-11-27 17:22:07.000000000 +0100 @@ -253,7 +253,7 @@ # # Initializations. @@ -29,3 +29,15 @@ # Check whether --with-newshome or --without-newshome was given. +@@ -1890,7 +1890,11 @@ + # it has been reported that some INN 2.1 had its own VERSION + VERSION_save="$VERSION" + VERSION= ++ prefix_orig="${prefix}" ++ exec_prefix_orig="${exec_prefix}" + . $NEWSCONFIG ++ prefix="${prefix_orig}" ++ exec_prefix="${exec_prefix_orig}" + INN_VERSION="$VERSION" + VERSION="$VERSION_save" + INN_NEWSUMASK=`umask` Modified: head/news/newsx/pkg-plist ============================================================================== --- head/news/newsx/pkg-plist Wed Nov 27 22:11:46 2013 (r335069) +++ head/news/newsx/pkg-plist Wed Nov 27 22:33:26 2013 (r335070) @@ -1,5 +1,9 @@ -bin/newsx bin/newsq +bin/newsx +man/man1/newsq.1.gz +man/man5/in.hosts.5.gz +man/man5/newsx.conf.5.gz +man/man8/newsx.8.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -9,6 +13,6 @@ bin/newsq %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm news/spool/inhosts +@dirrmtry news/spool/inhosts @dirrmtry news/spool @dirrmtry news