Index: head/news/newsx/Makefile
===================================================================
--- head/news/newsx/Makefile	(revision 484893)
+++ head/news/newsx/Makefile	(revision 484894)
@@ -1,61 +1,62 @@
 # Created by: Thierry Thomas <tthomas@mail.dotcom.fr>
 # $FreeBSD$
 
 PORTNAME=	newsx
 PORTVERSION=	1.6
-PORTREVISION=	3
+PORTREVISION=	4
 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:news/cnews
 .elif !defined(WITHOUT_INN_2-X)
-BUILD_DEPENDS=	${LOCALBASE}/news/lib/libinn.a:news/inn
+BUILD_DEPENDS=	${LOCALBASE}/news/lib/libinn.so:news/inn
+RUN_DEPENDS=	${LOCALBASE}/news/lib/libinn.so: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
+CPPFLAGS+=	-I${LOCALBASE}/news/include/inn
 .endif
 .endif
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--without-history
 .endif
 
 PORTDOCS=		AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
 
 .include <bsd.port.options.mk>
 
 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-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/news/newsx/files/patch-configure
===================================================================
--- head/news/newsx/files/patch-configure	(revision 484893)
+++ head/news/newsx/files/patch-configure	(revision 484894)
@@ -1,44 +1,82 @@
 --- 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 @@ 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,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`
+@@ -6568,14 +6573,14 @@ fi
+ 
+ 
+     LIBS_save="$LIBS"
+-                    LIBS="$LIBS -linn -lstorage"
++                    LIBS="$LIBS -linn -lstorage -linnhist"
+     echo "$as_me:$LINENO: checking for IsToken in -lstorage" >&5
+ echo $ECHO_N "checking for IsToken in -lstorage... $ECHO_C" >&6
+ if test "${ac_cv_lib_storage_IsToken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lstorage  $LIBS"
++LIBS="-lstorage -linnhist $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -7074,7 +7079,7 @@ if test x$HAVE_GETOPT != x1; then
+     MORELIBS2="$MORELIBS2 ../lib/libgetopt.a"
+ fi
+ if test x$HAVE_LIBINN = x1; then
+-        MORELIBS1="$MORELIBS1 -L$NEWSLIB"
++        MORELIBS1="$MORELIBS1 -L$NEWSLIB -Wl,-rpath -Wl,$NEWSLIB"
+     MORELIBS2="$MORELIBS2 -linn"
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -7086,9 +7091,9 @@ else
+ fi
+ if test x$HAVE_LIBSTORAGE = x1; then
+         if test x$HAVE_LIBINN != x1; then
+-	MORELIBS1="$MORELIBS1 -L$NEWSLIB"
++	MORELIBS1="$MORELIBS1 -L$NEWSLIB -Wl,-rpath -Wl,$NEWSLIB"
+     fi
+-                        MORELIBS2="-lstorage $MORELIBS2 -lstorage"
++                        MORELIBS2="-lstorage $MORELIBS2 -lstorage  -linnhist"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSTORAGE 1
Index: head/news/newsx/pkg-descr
===================================================================
--- head/news/newsx/pkg-descr	(revision 484893)
+++ head/news/newsx/pkg-descr	(revision 484894)
@@ -1,15 +1,15 @@
 Newsx is an NNTP client for Unix. It will connect to a remote NNTP
 server and post outgoing articles batched by the news system, as well as
 fetch incoming articles.
 
 It provides the NNTP capabilities required for small local news spools
 on installations with NNTP access only through limited ISP accounts. It
 works well via a dialup SLIP/PPP connection.
 
 Newsx is also well suited for large spools with normal feeds, being
 used for pulling newsgroups from specific NNTP servers that are not
 distributed in the usual manner. Since newsx obeys the normal news spool
 configuration file and requires little or no specific configuration, the
 administrative burden should be minimized.
 
-WWW: http://www.kvaleberg.com/newsx.html
+WWW: http://www.kvaleberg.no/newsx.html