pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xmakemol: a couple of fixes.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Thu Dec 22 08:25:52 2022 +0100
Changeset:	dcc31f8a49f034324a3824451ba143571b2e00e4

Modified Files:
	xmakemol/Makefile
	xmakemol/distinfo
Added Files:
	xmakemol/MESSAGE
	xmakemol/patches/patch-Makefile.in
	xmakemol/patches/patch-xmakemol.1

Log Message:
xmakemol: a couple of fixes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dcc31f8a49f034324a3824451ba143571b2e00e4

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

diffstat:
 xmakemol/MESSAGE                   |  8 ++++++++
 xmakemol/Makefile                  |  8 +++++++-
 xmakemol/distinfo                  |  2 ++
 xmakemol/patches/patch-Makefile.in | 14 ++++++++++++++
 xmakemol/patches/patch-xmakemol.1  | 15 +++++++++++++++
 5 files changed, 46 insertions(+), 1 deletion(-)

diffs:
diff --git a/xmakemol/MESSAGE b/xmakemol/MESSAGE
new file mode 100644
index 0000000000..d67f20eb8b
--- /dev/null
+++ b/xmakemol/MESSAGE
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD$
+
+To use xmakemol, set the XM_ELEMENTS environmental variable as below:
+
+	export XM_ELEMENTS=${PREFIX}/share/xmakemol/elements
+
+===========================================================================
diff --git a/xmakemol/Makefile b/xmakemol/Makefile
index 9aa14dcc79..8a166d50ed 100644
--- a/xmakemol/Makefile
+++ b/xmakemol/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	xmakemol-5.16h
-CATEGORIES=	biology
+CATEGORIES=	biology x11
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/vins/dists/
 EXTRACT_SUFX=	.tar.xz
 
@@ -18,6 +18,12 @@ REPLACE_PERL=	xmake_anim.pl
 
 ELEM_FILE=	${WRKSRC}/elements
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths+=	xmakemol.1
+SUBST_VARS.paths=	PREFIX
+SUBST_MESSAGE.paths=	Replacing PREFIX placeholder.
+
 CONFIGURE_ARGS+=	--with-mesa
 CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_PREFIX.MesaLib}
 
diff --git a/xmakemol/distinfo b/xmakemol/distinfo
index 326909e854..2e2148f051 100644
--- a/xmakemol/distinfo
+++ b/xmakemol/distinfo
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.1.1.1 2011/03/20 23:43:21 jihbed Exp $
 BLAKE2s (xmakemol-5.16h.tar.xz) = 104be5a568d52cceacf8aa0f4c7619d7aa2f0039b4b45ad1ece34aa2c4e895e2
 SHA512 (xmakemol-5.16h.tar.xz) = 63ce47a96aaa61872bd27cb60befe175f72b0a3560ce48056d21fce91e0d268436c73b4ddc9bd9fa539cbabe4934167da92122847e226657178e82a7d0e01280
 Size (xmakemol-5.16h.tar.xz) = 216832 bytes
+SHA1 (patch-Makefile.in) = 57d571687495e824866a9040e43da3ad95ca1904
+SHA1 (patch-xmakemol.1) = ef991119d9e5534d6032b7e94f3ea7d7c1cacbe3
diff --git a/xmakemol/patches/patch-Makefile.in b/xmakemol/patches/patch-Makefile.in
new file mode 100644
index 0000000000..220418dd44
--- /dev/null
+++ b/xmakemol/patches/patch-Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD$
+
+datarootdir support.
+
+--- Makefile.in.orig	2022-12-22 06:47:47.695595945 +0000
++++ Makefile.in
+@@ -41,6 +41,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
diff --git a/xmakemol/patches/patch-xmakemol.1 b/xmakemol/patches/patch-xmakemol.1
new file mode 100644
index 0000000000..fbc7e2d5a3
--- /dev/null
+++ b/xmakemol/patches/patch-xmakemol.1
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix hardcoded path.
+
+--- xmakemol.1.orig	2005-03-07 10:49:49.000000000 +0000
++++ xmakemol.1
+@@ -47,7 +47,7 @@ Print version information.
+ 
+ .SH FILES
+ .LP 
+-\fI/usr/share/xmakemol/elements\fP
++\fI@PREFIX@/share/xmakemol/elements\fP
+ List of element properties.
+ 
+ .SH ENVIRONMENT VARIABLES


Home | Main Index | Thread Index | Old Index