pkgsrc-WIP-changes archive

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

slurm: Patch configure to use ${PREFIX} instead of /usr/local



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Mon May 16 17:26:01 2016 -0500
Changeset:	c2a2b41eca99bc4639fecc24b6e5522ef8907bdb

Modified Files:
	man2html/Makefile
	slurm/Makefile
	slurm/TODO

Log Message:
slurm: Patch configure to use ${PREFIX} instead of /usr/local

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

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

diffstat:
 man2html/Makefile | 2 --
 slurm/Makefile    | 6 +++++-
 slurm/TODO        | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/man2html/Makefile b/man2html/Makefile
index 7004b86..123cc94 100644
--- a/man2html/Makefile
+++ b/man2html/Makefile
@@ -32,6 +32,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man2html.1 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/man.cgi ${DESTDIR}${CGIDIR}
 
-# Linux doesn't have zlib in the base, so just in case...
-# .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/slurm/Makefile b/slurm/Makefile
index d9c5490..5b1a665 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -21,7 +21,6 @@ USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
 CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
-CONFIGURE_ARGS+=	--with-json=${PREFIX}
 
 REPLACE_PYTHON=		doc/html/shtml2html.py
 REPLACE_PYTHON+=	doc/man/man2html.py
@@ -47,6 +46,11 @@ SUBST_SED.linuxinit+=	-e 's|@sbindir@|$${exec_prefix}/sbin|'
 SUBST_SED.linuxinit+=	-e 's|@libdir@|$${exec_prefix}/lib|'
 SUBST_SED.linuxinit+=	-e 's|@sysconfdir@|$${prefix}/etc|'
 
+SUBST_CLASSES+=		configure
+SUBST_STAGE.configure=	post-patch
+SUBST_FILES.configure=	configure
+SUBST_SED.configure=	-e 's|/usr/local|${PREFIX}|g'
+
 INSTALLATION_DIRS+=	share/examples/${PKGBASE}
 
 post-install:
diff --git a/slurm/TODO b/slurm/TODO
index c1eba56..27954e4 100644
--- a/slurm/TODO
+++ b/slurm/TODO
@@ -2,3 +2,5 @@ mkdir /var/log/slurm /var/run/slurm?
 
 NetBSD build installs fewer files in share/doc/slurm/html because it lacks
 man2html.
+	man2html Perl script does not work
+	Seems to requires man2html from Gnu man package


Home | Main Index | Thread Index | Old Index