Index: head/news/newsx/Makefile =================================================================== --- head/news/newsx/Makefile (revision 404739) +++ head/news/newsx/Makefile (revision 404740) @@ -1,63 +1,61 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= newsx PORTVERSION= 1.6 PORTREVISION= 3 CATEGORIES= news MASTER_SITES= http://www.kvaleberg.org/pub/ MAINTAINER= thierry@FreeBSD.org COMMENT= Program to fetch news from and post news to a remote NNTP server LICENSE= GPLv2 .if defined(WITH_CNEWS) BUILD_DEPENDS= ${LOCALBASE}/news/lib/libcnews.a:${PORTSDIR}/news/cnews .elif !defined(WITHOUT_INN_2-X) BUILD_DEPENDS= ${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn .endif GNU_CONFIGURE= yes CONFLICTS= leafnode-1.* OPTIONS_DEFINE= DOCS .if !defined(WITH_CNEWS) .if !defined(WITHOUT_INN_2-X) CPPFLAGS+= -I${LOCALBASE}/news/include .endif .endif .if defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --without-history .endif -DOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO +PORTDOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO .include 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" @${ECHO} "${PORTSDIR}/news/inn, and then try building this port" @${ECHO} "again." @${ECHO} "*********************************************************" post-build: .if !defined(WITH_DEBUG) ${STRIP_CMD} ${WRKSRC}/src/newsx .endif -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/inhosts +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for FILE in ${DOCS} +.for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor - @${ECHO} "Documentation installed in ${DOCSDIR}." .include Index: head/news/newsx/files/patch-configure =================================================================== --- head/news/newsx/files/patch-configure (revision 404739) +++ head/news/newsx/files/patch-configure (revision 404740) @@ -1,43 +1,44 @@ ---- configure.orig 2003-05-18 19:25:34.000000000 +0200 -+++ configure 2013-11-27 17:22:07.000000000 +0100 -@@ -253,7 +253,7 @@ +--- configure.orig 2003-05-18 17:25:34 UTC ++++ configure +@@ -253,7 +253,7 @@ exec 6>&1 # # Initializations. # -ac_default_prefix=/usr/local +ac_default_prefix=%%LOCALBASE%% ac_config_libobj_dir=. cross_compiling=no subdirs= -@@ -1712,15 +1712,15 @@ +@@ -1712,15 +1712,15 @@ PACKAGE_DATE=`date | sed 's/^[^ ]* \([^ VISIT="/usr/lib/news /var/news/etc /usr/spool/news /usr/share/news \ - /var/db/news /usr/local/news/control /usr/local/news /local/news /etc/news \ - /usr/local/news/bin/control /usr/local/lib/news /news /usr/local/inn \ + /var/db/news %%LOCALBASE%%/news/control %%LOCALBASE%%/news /local/news /etc/news \ + %%LOCALBASE%%/news/bin/control %%LOCALBASE%%/lib/news /news %%LOCALBASE%%/inn \ /var/lib/news /usr/lib /var/spool/news" INN_NEWSUMASK=002 INN_EXTENDEDDBZ=0 -RNEWS_PATH=/usr/bin/rnews -INEWS_PATH=/usr/bin/inews +RNEWS_PATH=%%LOCALBASE%%/news/bin/rnews +INEWS_PATH=%%LOCALBASE%%/news/bin/inews # Check whether --with-newshome or --without-newshome was given. -@@ -1890,7 +1890,11 @@ +@@ -1890,7 +1890,12 @@ echo $ECHO_N "checking and found INN... # 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 ++ unset TMPDIR + prefix="${prefix_orig}" + exec_prefix="${exec_prefix_orig}" INN_VERSION="$VERSION" VERSION="$VERSION_save" INN_NEWSUMASK=`umask` Index: head/news/newsx/pkg-plist =================================================================== --- head/news/newsx/pkg-plist (revision 404739) +++ head/news/newsx/pkg-plist (revision 404740) @@ -1,18 +1,7 @@ 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 -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry news/spool/inhosts -@dirrmtry news/spool -@dirrmtry news +@dir(news,news,) news/spool/inhosts