Tue Jan 16 22:56:41 2024 UTC (141d)
devel/rt-mysql: fix references to stale destdir, bump revision


(rillig)
diff -r1.21 -r1.22 pkgsrc/devel/rt-mysql/Makefile
diff -r1.23 -r1.24 pkgsrc/devel/rt-mysql/Makefile.common
cvs diff -r1.21 -r1.22 pkgsrc/devel/rt-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/rt-mysql/Makefile 2022/06/28 11:33:42 1.21
+++ pkgsrc/devel/rt-mysql/Makefile 2024/01/16 22:56:41 1.22
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile,v 1.21 2022/06/28 11:33:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2024/01/16 22:56:41 rillig Exp $
2 2
3PKGREVISION= 20 3PKGREVISION= 21
4RT_DB_TYPE= mysql 4RT_DB_TYPE= mysql
5 5
6.include "../../devel/rt-mysql/Makefile.common" 6.include "../../devel/rt-mysql/Makefile.common"
cvs diff -r1.23 -r1.24 pkgsrc/devel/rt-mysql/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/rt-mysql/Makefile.common 2019/11/03 10:39:29 1.23
+++ pkgsrc/devel/rt-mysql/Makefile.common 2024/01/16 22:56:41 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.23 2019/11/03 10:39:29 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.24 2024/01/16 22:56:41 rillig Exp $
2# used by devel/rt-mysql/Makefile 2# used by devel/rt-mysql/Makefile
3# used by devel/rt-pgsql/Makefile 3# used by devel/rt-pgsql/Makefile
4 4
5DISTNAME= rt-2-0-15 5DISTNAME= rt-2-0-15
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.bestpractical.com/rt/release/ 7MASTER_SITES= http://www.bestpractical.com/rt/release/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.bestpractical.com/rt/ 10HOMEPAGE= http://www.bestpractical.com/rt/
11COMMENT= Industrial-grade ticketing system 11COMMENT= Industrial-grade ticketing system
12CONFLICTS= rt-*-[0-9]* 12CONFLICTS= rt-*-[0-9]*
13 13
14PKG_DESTDIR_SUPPORT= destdir 14PKG_DESTDIR_SUPPORT= destdir
@@ -101,26 +101,31 @@ SUBST_CLASSES+= rt @@ -101,26 +101,31 @@ SUBST_CLASSES+= rt
101SUBST_STAGE.rt= pre-configure 101SUBST_STAGE.rt= pre-configure
102SUBST_FILES.rt= Makefile rtconfig README.pkg 102SUBST_FILES.rt= Makefile rtconfig README.pkg
103SUBST_VARS.rt= PREFIX RT_GROUP \ 103SUBST_VARS.rt= PREFIX RT_GROUP \
104 RT_PATH RT_LOG_PATH RT_DATA_PATH RT_SESSION_PATH \ 104 RT_PATH RT_LOG_PATH RT_DATA_PATH RT_SESSION_PATH \
105 RT_DB_TYPE RT_DB_DBA RT_DB_DBA_PASSWORD RT_DB_DATABASE RT_DB_USER \ 105 RT_DB_TYPE RT_DB_DBA RT_DB_DBA_PASSWORD RT_DB_DATABASE RT_DB_USER \
106 RT_DB_PASS RT_DB_HOME RT_DB_HOST RT_DB_PORT RT_WEB_USER RT_WEB_GROUP 106 RT_DB_PASS RT_DB_HOME RT_DB_HOST RT_DB_PORT RT_WEB_USER RT_WEB_GROUP
107 107
108INSTALL_MAKE_FLAGS+= BIN_OWNER=${BINOWN} 108INSTALL_MAKE_FLAGS+= BIN_OWNER=${BINOWN}
109INSTALL_MAKE_FLAGS+= LIBS_OWNER=${LIBOWN} 109INSTALL_MAKE_FLAGS+= LIBS_OWNER=${LIBOWN}
110INSTALL_MAKE_FLAGS+= LIBS_GROUP=${LIBGRP} 110INSTALL_MAKE_FLAGS+= LIBS_GROUP=${LIBGRP}
111INSTALL_MAKE_FLAGS+= RTGROUP=${RT_GROUP} 111INSTALL_MAKE_FLAGS+= RTGROUP=${RT_GROUP}
112USERGROUP_PHASE= pre-install 112USERGROUP_PHASE= pre-install
113 113
 114SUBST_CLASSES+= destdir
 115SUBST_STAGE.destdir= post-install
 116SUBST_FILES.destdir= ${DESTDIR}${PREFIX}/rt/lib/auto/RT/.packlist
 117SUBST_SED.destdir= -e 's|^${DESTDIR}${PREFIX}|${PREFIX}|'
 118
114post-extract: 119post-extract:
115 @${STEP_MSG} "Removing CVS directories from work directory" 120 @${STEP_MSG} "Removing CVS directories from work directory"
116 ${FIND} ${WRKSRC} -name CVS -type d -print | ${XARGS} ${RM} -rf 121 ${FIND} ${WRKSRC} -name CVS -type d -print | ${XARGS} ${RM} -rf
117 122
118post-patch: 123post-patch:
119 ${CP} ${FILESDIR}/rtconfig ${WRKSRC}/rtconfig 124 ${CP} ${FILESDIR}/rtconfig ${WRKSRC}/rtconfig
120 ${CP} ${FILESDIR}/README ${WRKSRC}/README.pkg 125 ${CP} ${FILESDIR}/README ${WRKSRC}/README.pkg
121 126
122pre-build: 127pre-build:
123 set -e; (mkdir -p ${WRKSRC}/src; \ 128 set -e; (mkdir -p ${WRKSRC}/src; \
124 cd ${WRKSRC}/src; \ 129 cd ${WRKSRC}/src; \
125 ${CP} ${FILESDIR}/wrapper.c .; \ 130 ${CP} ${FILESDIR}/wrapper.c .; \
126 ${ECHO} '#define RT_REAL_PATH "${RT_PATH}/bin/real"' > config.h; \ 131 ${ECHO} '#define RT_REAL_PATH "${RT_PATH}/bin/real"' > config.h; \