Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715169782118060"
MIME-Version: 1.0
Date: Wed, 8 May 2024 12:03:02 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/rt5
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240508120302.06D8EFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715169782118060
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed May  8 12:03:01 UTC 2024

Modified Files:
	pkgsrc/devel/rt5: INSTALL Makefile distinfo
Added Files:
	pkgsrc/devel/rt5/patches: patch-etc_cpanfile

Log Message:
rt5: fix build

This wants to use LWP::Simple (in a file that doesn't get installed...)
but the detection logic doesn't detect the one coming with p5-libwww.
Remove it from the detection.

While here, fix the INSTALL script.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/rt5/INSTALL
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/rt5/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/rt5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/rt5/patches/patch-etc_cpanfile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715169782118060
Content-Disposition: inline
Content-Length: 3208
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/rt5/INSTALL
diff -u pkgsrc/devel/rt5/INSTALL:1.1 pkgsrc/devel/rt5/INSTALL:1.2
--- pkgsrc/devel/rt5/INSTALL:1.1	Thu Oct  6 02:18:16 2022
+++ pkgsrc/devel/rt5/INSTALL	Wed May  8 12:03:01 2024
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: INSTALL,v 1.1 2022/10/06 02:18:16 markd Exp $
+# $NetBSD: INSTALL,v 1.2 2024/05/08 12:03:01 wiz Exp $
 
 WWWGRP="@WWWGRP@"
 WWWOWN="@WWWOWN@"
@@ -9,9 +9,8 @@ RT5ETCDIR="@RT5ETCDIR@"
 
 case "${STAGE}" in
 POST-INSTALL)
-	cd ${RT4DIR} &&
-		${CHOWN} -R ${WWWOWN} ${RT5DIR} &&
-		${CHOWN} -R ${WWWOWN} ${RT5ETCDIR} &&
-		${CHGRP} -R ${WWWGRP} ${RT5DIR}
+	${CHOWN} -R ${WWWOWN} ${RT5DIR}
+	${CHGRP} -R ${WWWGRP} ${RT5DIR}
+	${CHOWN} -R ${WWWOWN} ${RT5ETCDIR}
 	;;
 esac

Index: pkgsrc/devel/rt5/Makefile
diff -u pkgsrc/devel/rt5/Makefile:1.3 pkgsrc/devel/rt5/Makefile:1.4
--- pkgsrc/devel/rt5/Makefile:1.3	Mon Dec 25 13:48:41 2023
+++ pkgsrc/devel/rt5/Makefile	Wed May  8 12:03:01 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2023/12/25 13:48:41 spz Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/08 12:03:01 wiz Exp $
 
 DISTNAME=	rt-5.0.5
 PKGNAME=	${DISTNAME:S/rt/rt5/}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://download.bestpractical.com/pub/rt/release/
 
@@ -167,7 +168,7 @@ RT5DIR=		${PREFIX}/share/rt5
 
 BUILD_DEFS+=	APACHE_GROUP APACHE_USER
 FILES_SUBST+=	WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
-		RT5DIR=${RT5DIR}
+		RT5DIR=${RT5DIR} RT5ETCDIR=${RT5DIR}/etc
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure

Index: pkgsrc/devel/rt5/distinfo
diff -u pkgsrc/devel/rt5/distinfo:1.2 pkgsrc/devel/rt5/distinfo:1.3
--- pkgsrc/devel/rt5/distinfo:1.2	Thu Nov  2 19:15:10 2023
+++ pkgsrc/devel/rt5/distinfo	Wed May  8 12:03:01 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2023/11/02 19:15:10 markd Exp $
+$NetBSD: distinfo,v 1.3 2024/05/08 12:03:01 wiz Exp $
 
 BLAKE2s (rt-5.0.5.tar.gz) = b96354bfc3b9b2211a066b57ab6d393ab0f2c205553ce4f1e35e498ddb027c5e
 SHA512 (rt-5.0.5.tar.gz) = 0d49bae9cbeefb93c48cd6d4e5389d12922a5ef93374945d29d69afc723ff1c1b78f8a02c2971bcfae0ce7dfef8aae8874fc14603b11d05a0d90db6f6fa0aff6
 Size (rt-5.0.5.tar.gz) = 19055361 bytes
 SHA1 (patch-Makefile.in) = 9009623bc764c351dcb79d365a4b0728b18f4205
 SHA1 (patch-config.layout) = 9e94a03bc33ea2bbb353172ce9d89365dc8bc723
+SHA1 (patch-etc_cpanfile) = 2af513ff4b95ca6f4e87563e01e971e571d61390

Added files:

Index: pkgsrc/devel/rt5/patches/patch-etc_cpanfile
diff -u /dev/null pkgsrc/devel/rt5/patches/patch-etc_cpanfile:1.1
--- /dev/null	Wed May  8 12:03:01 2024
+++ pkgsrc/devel/rt5/patches/patch-etc_cpanfile	Wed May  8 12:03:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-etc_cpanfile,v 1.1 2024/05/08 12:03:01 wiz Exp $
+
+LWP::Simple is part of p5-libwww but somehow isn't found by this tool.
+
+--- etc/cpanfile.orig	2024-05-08 11:52:18.116294109 +0000
++++ etc/cpanfile
+@@ -57,7 +57,7 @@ requires 'Locale::Maketext', '>= 1.06';
+ requires 'Locale::Maketext::Fuzzy', '>= 0.11';
+ requires 'Locale::Maketext::Lexicon', '>= 0.32';
+ requires 'Log::Dispatch', '>= 2.30';
+-requires 'LWP::Simple';
++#requires 'LWP::Simple';
+ requires 'Mail::Header', '>= 2.12';
+ requires 'Mail::Mailer', '>= 1.57';
+ requires 'MIME::Entity', '>= 5.504';


--_----------=_1715169782118060--