From owner-svn-ports-head@freebsd.org Tue Nov 13 18:39:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 783C3112D849; Tue, 13 Nov 2018 18:39:07 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2ADD4720B0; Tue, 13 Nov 2018 18:39:06 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CD5214094; Tue, 13 Nov 2018 18:39:06 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wADId5q9029862; Tue, 13 Nov 2018 18:39:05 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wADId5rV029860; Tue, 13 Nov 2018 18:39:05 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201811131839.wADId5rV029860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 13 Nov 2018 18:39:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484894 - in head/news/newsx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/news/newsx: . files X-SVN-Commit-Revision: 484894 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2ADD4720B0 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 13 Nov 2018 18:39:07 -0000 Author: thierry Date: Tue Nov 13 18:39:05 2018 New Revision: 484894 URL: https://svnweb.freebsd.org/changeset/ports/484894 Log: - Fix with INN's shared libraries; - Fix WWW. Modified: head/news/newsx/Makefile head/news/newsx/files/patch-configure head/news/newsx/pkg-descr Modified: head/news/newsx/Makefile ============================================================================== --- head/news/newsx/Makefile Tue Nov 13 18:35:02 2018 (r484893) +++ head/news/newsx/Makefile Tue Nov 13 18:39:05 2018 (r484894) @@ -3,7 +3,7 @@ PORTNAME= newsx PORTVERSION= 1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= news MASTER_SITES= http://www.kvaleberg.org/pub/ @@ -15,7 +15,8 @@ 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 @@ -26,7 +27,7 @@ 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 Modified: head/news/newsx/files/patch-configure ============================================================================== --- head/news/newsx/files/patch-configure Tue Nov 13 18:35:02 2018 (r484893) +++ head/news/newsx/files/patch-configure Tue Nov 13 18:39:05 2018 (r484894) @@ -42,3 +42,41 @@ 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 Modified: head/news/newsx/pkg-descr ============================================================================== --- head/news/newsx/pkg-descr Tue Nov 13 18:35:02 2018 (r484893) +++ head/news/newsx/pkg-descr Tue Nov 13 18:39:05 2018 (r484894) @@ -12,4 +12,4 @@ distributed in the usual manner. Since newsx obeys the 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