Date: Tue, 13 Nov 2018 18:39:05 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484894 - in head/news/newsx: . files Message-ID: <201811131839.wADId5rV029860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811131839.wADId5rV029860>