pkgsrc-WIP-changes archive

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

udev: Fix nbsed subst



Module Name:	pkgsrc-wip
Committed By:	Denys Nykula <nykula%ukr.net@localhost>
Pushed By:	nykula
Date:		Fri Jul 17 22:32:01 2020 +0300
Changeset:	8c7fcda954b516c9d0df93ca46bb05104a12c4f1

Modified Files:
	libudev/Makefile
	udev/Makefile

Log Message:
udev: Fix nbsed subst

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

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

diffstat:
 libudev/Makefile |  6 +++++-
 udev/Makefile    | 22 +++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diffs:
diff --git a/libudev/Makefile b/libudev/Makefile
index 6a6662df2d..f82ff98a51 100644
--- a/libudev/Makefile
+++ b/libudev/Makefile
@@ -3,8 +3,12 @@
 COMMENT=		Device enumeration and database of constants
 CONFIGURE_ARGS+=	--disable-programs
 
+SUBST_CLASSES+=		nogperf
+SUBST_STAGE.nogperf=	pre-configure
+SUBST_FILES.nogperf=	configure.ac
+SUBST_SED.nogperf=	's,ERROR\(.*gperf\),WARN\1,'
+
 pre-configure:
-	sed -i 's/ERROR\(.*gperf\)/WARN\1/' ${WRKSRC}/configure.ac
 	cd ${WRKSRC} &&autoreconf -fiv
 
 .include "../../wip/libudev/Makefile.common"
diff --git a/udev/Makefile b/udev/Makefile
index 7cd607b785..cf583f5f06 100644
--- a/udev/Makefile
+++ b/udev/Makefile
@@ -4,12 +4,24 @@ PKGNAME=		udev-243
 COMMENT=		Hotplug daemon
 CONFIGURE_ARGS+=	--disable-hwdb
 
+SUBST_CLASSES+=		nobin
+SUBST_STAGE.nobin=	pre-configure
+SUBST_FILES.nobin=	src/udev/Makefile.am
+SUBST_SED.nobin=	's,.(LN.*;,true;,'
+
+SUBST_CLASSES+=		onlyudev
+SUBST_STAGE.onlyudev=	pre-configure
+SUBST_FILES.onlyudev=	src/Makefile.am
+SUBST_SED.onlyudev=	's,.(PROGRAMS_SUBDIRS),udev,'
+
+SUBST_CLASSES+=		rootrun
+SUBST_STAGE.rootrun=	pre-configure
+SUBST_FILES.rootrun=	src/udev/*.c
+SUBST_SED.rootrun=	's,/run,"UDEV_ROOT_RUN",'
+
 pre-configure:
-	cp ${FILESDIR}/rules.am ${WRKSRC}/rules/Makefile.am
-	sed -i 's/.(PROGRAMS_SUBDIRS)/udev/' ${WRKSRC}/src/Makefile.am
-	cp ${FILESDIR}/libudev.am ${WRKSRC}/src/libudev/Makefile.am
-	sed -i 's/.(LN.*;/true;/' ${WRKSRC}/src/udev/Makefile.am
-	sed -i 's,/run,"UDEV_ROOT_RUN",' ${WRKSRC}/src/udev/*.c
+	${CP} ${FILESDIR}/rules.am ${WRKSRC}/rules/Makefile.am
+	${CP} ${FILESDIR}/libudev.am ${WRKSRC}/src/libudev/Makefile.am
 	cd ${WRKSRC} &&autoreconf -fiv
 
 .include "../../devel/gperf/buildlink3.mk"


Home | Main Index | Thread Index | Old Index