From nobody Sun Sep 04 00:27:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKssd0yWNz4c1k2; Sun, 4 Sep 2022 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKssd0T7sz3D3v; Sun, 4 Sep 2022 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662251221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PxN1FBS5EMwyJxB1nrxUhwHjNOLf8/okFy9BqQxrAM=; b=rC4VPHfFLrUKfDiW5uODSG9L0AKSf86dBC/Ru+kfGj7PSTfnAzMbOUrW4ZLkX3rriw0bBL n2tSJTuIdcLzww6OR2VM4VqCJSpBPUa7WYj7sRWvzzRomfyjFaNNjEn4fElRdSVuL8bb+E YEPE4MBpbfdfiSNdPiknQiYCrOhO7iYu4n0T1OkF8oxrWdaJahDO2R/rrjTiRdCyHfyHXB HrgxDJQdZukleH3qJ9OlP+W06/F0C7Wn/2TyAXj/Mz2VJb2KQmjwXCwwCHzlws3/1NJd+L PSmGypKMZ1qv1NmQmSTiywM0U4wMJHMZ4/PV6fmQ4az5XuSumW70YhCQHaVCvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKssc6fPpzK9x; Sun, 4 Sep 2022 00:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2840R0jS022446; Sun, 4 Sep 2022 00:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2840R0US022445; Sun, 4 Sep 2022 00:27:00 GMT (envelope-from git) Date: Sun, 4 Sep 2022 00:27:00 GMT Message-Id: <202209040027.2840R0US022445@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: b8fd81efdd50 - main - news/newsstar: fix OpenSSL detection & cleanups List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8fd81efdd5021304bf957405a58490b7c105513 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662251221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PxN1FBS5EMwyJxB1nrxUhwHjNOLf8/okFy9BqQxrAM=; b=eVnxffiMijeup74SCWF4RFK6zKD/i6l4v6a04CZ+zHd4kbdW9e55YKdUfHidWiPDnF8hqr vwXpQkezK3gn/qh8mn5r7SyZbmav9DM1YmtxVKGTJIm3dJju9+ugPi01z0aJAMWoCm4KX9 2Q1YUJJnVMZPGTBJtOt/H0+TTCw1cEYtslKiNV6+vfBLuB+482mwtzyBLQPVvYgEbANpcr 9c3pSQseg8m70V8MhyPBPd+c0yp7sTfuvSzI2ABKZLXNLQffJNs/mDsab9Cv6qokIf2fxC RgjoNoSxNFR2gcvyqgJho1eotyflc4VC8KxO6NFUTqM9gohUhJoKFSn5s+QuYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662251221; a=rsa-sha256; cv=none; b=BYHVKX+zPPYb9IlKEGRCoRqJh25wefAxeZGbHxLQA7VGAcz8aSXtMI6bm+NUfYPVO0NyXa zjH0Tj6ObMeyUazEffTJnJIrTonyWxvNY1bCHy2K0dNSqvj0ofKeqOqJamtCd6IbXpfLwk uYAH/mm2OnGmOsYALiwnZ0CW+OAaOxMeEEH5d84eq543C5W9L9Bx8oV+R/7mJ5TwKxL2mJ VLgo4nrmgiRev9KpKBsAHIaWuB5lCSPy1d5+k8XoGs/Gbt+tNbRq5h3mRs/egzKRwGQbd+ svVlFuSu3voeg/JLTG3z4RvVwjS7C9JKl7QjQw8P+LUw9WDivy0QYSCCfGZvMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8fd81efdd5021304bf957405a58490b7c105513 commit b8fd81efdd5021304bf957405a58490b7c105513 Author: Matthias Andree AuthorDate: 2022-09-04 00:24:54 +0000 Commit: Matthias Andree CommitDate: 2022-09-04 00:26:57 +0000 news/newsstar: fix OpenSSL detection & cleanups OpenSSL detection was broken because it looked for SSL_library_init(), which has been gone since OpenSSL 1.1.0 already. Patch to look for OPENSSL_init_ssl() instead. Replace @exec by @postexec. Add USES=ncurses. Rearrange Makefile to reduce complaints from portclippy and portlint. --- news/newsstar/Makefile | 18 +++++++++++------- news/newsstar/pkg-plist | 6 +++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile index 7b8617d84181..21c075cd3db7 100644 --- a/news/newsstar/Makefile +++ b/news/newsstar/Makefile @@ -1,6 +1,6 @@ PORTNAME= newsstar PORTVERSION= 1.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= news MASTER_SITES= SF @@ -9,17 +9,17 @@ COMMENT= Transfer news between a local NNTP server (INN, sn, s-news) LICENSE= GPLv3 -LIB_DEPENDS= libgdbm.so:databases/gdbm BUILD_DEPENDS= xmlto:textproc/xmlto \ ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:textproc/docbook-xml +LIB_DEPENDS= libgdbm.so:databases/gdbm -GNU_CONFIGURE= yes -USES= iconv perl5 shebangfix -SHEBANG_FILES= newsstar.in +USES= iconv ncurses perl5 shebangfix +IGNORE_SSL= libressl libressl-devel +IGNORE_SSL_REASON=GPL linking exeption only provided for OpenSSL -OPTIONS_DEFINE= SSL DOCS EXAMPLES -OPTIONS_DEFAULT= SSL +SHEBANG_FILES= newsstar.in +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-chown \ --with-conf-dir=${PREFIX}/etc/newsstar \ --with-rc-dir=/var/spool/newsstar/lib \ @@ -28,6 +28,9 @@ CONFIGURE_ARGS+=--disable-chown \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} +OPTIONS_DEFINE= DOCS EXAMPLES SSL +OPTIONS_DEFAULT= SSL + .include .if ! ${PORT_OPTIONS:MDOCS} @@ -70,6 +73,7 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/share/sgml/docbook/dtd/xml|${LOCALBASE}/share/xml/docbook|' ${WRKSRC}/docs/manual.xml ${REINPLACE_CMD} -e 's|/usr/share/sgml/docbook/dtd/xml|${LOCALBASE}/share/xml/docbook|' ${WRKSRC}/docs/news.xml ${REINPLACE_CMD} -e 's|install-data-local: install-docs|install-data-local:|' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e 's|SSL_library_init|OPENSSL_init_ssl|' ${WRKSRC}/configure post-install: ${MAKE} -C ${WRKSRC}/src install DESTDIR=${STAGEDIR} diff --git a/news/newsstar/pkg-plist b/news/newsstar/pkg-plist index 408b4bf4f666..e2a468caccbc 100644 --- a/news/newsstar/pkg-plist +++ b/news/newsstar/pkg-plist @@ -1,6 +1,6 @@ -@exec d=/var/spool/newsstar/incoming ; test -d "$d" || install -d -onews -gnews -m0750 "$d" -@exec d=/var/spool/newsstar/lib ; test -d "$d" || install -d -onews -gnews -m0750 "$d" -@exec d="%D/%%ETCDIR%%" ; test -d "$d" || install -d -o0 -g0 -m0755 "$d" +@postexec d=/var/spool/newsstar/incoming ; test -d "$d" || install -d -onews -gnews -m0750 "$d" +@postexec d=/var/spool/newsstar/lib ; test -d "$d" || install -d -onews -gnews -m0750 "$d" +@postexec d="%D/%%ETCDIR%%" ; test -d "$d" || install -d -o0 -g0 -m0755 "$d" bin/newsstar man/man1/newsstar.1.gz libexec/newsstar/newsstar.bin