CVS commit: pkgsrc/x11/xcolor

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Apr  5 10:50:16 UTC 2025

Modified Files:
        pkgsrc/x11/xcolor: Makefile

Log Message:
Revert "x11/xcolor: Don't override do-install; add to it."

I must have tested this without a clean destdir.  do-cargo-install
must be specified explicitly if you create a do-install target.
Perhaps a better approach would be to hook on post-install, but let's
just revert this experiment for now.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xcolor/Makefile

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

Modified files:

Index: pkgsrc/x11/xcolor/Makefile
diff -u pkgsrc/x11/xcolor/Makefile:1.8 pkgsrc/x11/xcolor/Makefile:1.9
--- pkgsrc/x11/xcolor/Makefile:1.8      Wed Apr  2 12:27:28 2025
+++ pkgsrc/x11/xcolor/Makefile  Sat Apr  5 10:50:16 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/04/02 12:27:28 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2025/04/05 10:50:16 riastradh Exp $
 
 DISTNAME=      xcolor-0.5.1
 PKGREVISION=   2
@@ -21,8 +21,8 @@ INSTALLATION_DIRS=    bin ${PKGMANDIR}/man1
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 
-do-install: do-install-man
-do-install-man: .PHONY
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/target/release/xcolor ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/man/xcolor.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xcolor.1
 
 .include "../../lang/rust/cargo.mk"