CVS commit: pkgsrc/chat/matrix-synapse

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Nov 26 14:26:59 UTC 2024

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile

Log Message:
chat/matrix-synapse: Move .orig remediation to post-install

After giving up on fighting poetry to make it not install .orig files
and thus put them in the wheel built during the build stage, change to
removing the .orig files in destdir after the install target.

No change to binary package, but now mkpatches should be ok even after
make package.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/chat/matrix-synapse/Makefile

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

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.103 pkgsrc/chat/matrix-synapse/Makefile:1.104
--- pkgsrc/chat/matrix-synapse/Makefile:1.103   Sun Nov 24 14:57:46 2024
+++ pkgsrc/chat/matrix-synapse/Makefile Tue Nov 26 14:26:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2024/11/24 14:57:46 gdt Exp $
+# $NetBSD: Makefile,v 1.104 2024/11/26 14:26:59 gdt Exp $
 
 DISTNAME=      matrix-synapse-1.114.0
 PKGREVISION=   1
@@ -106,17 +106,16 @@ SUBST_VARS.pl=                    SYNAPSE_DEFAULT_CREATOR
 
 BUILD_DEFS+=                   SYNAPSE_DEFAULT_CREATOR_PL
 
-post-patch:
-       # synapse apparently installs "*", wrongly putting foo.orig in
-       # the package.  Remove them.  \todo This should be just before
-       # install, so that a "make" and "pkgvi" session followed by
-       # "mkpatches" will still work.
-       cd ${WRKSRC} && find . -name '*.orig' | xargs rm
-
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} files/README.pkgsrc.txt ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} files/README.pkgsrc.NetBSD.txt ${DESTDIR}${DOCDIR}
+       # upstream incorrectly includes .orig files in the wheel.
+       # Because the wheel is built during the build phase, not the
+       # install phase, a pre-install target to clean them up in the
+       # sources does not work.  Cleaning them up earlier breaks
+       # mkpatches.
+       cd ${DESTDIR} && find . -name '*.orig' | xargs rm 
 
 # \todo Grok upstream's new test scheme and port to it.
 # As of 1.98.0 all tests fail, most of them failing to import