ports/90220: emulators/linux_base-8 Makefile typo cause install error

Ulrich Spoerlein q at galgenberg.net
Tue Dec 13 11:57:40 PST 2005


>  I try to get time this week to fix the issue for rpm-4.

Since I made the mess, attached is a patch that fixes it for both rpm3
and rpm4. Just did a install/deinstall with both rpms, I hope this
really fixes it.

Ulrich Spoerlein

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/linux_base-8/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile	4 Dec 2005 13:12:08 -0000	1.112
+++ Makefile	13 Dec 2005 19:55:08 -0000
@@ -125,8 +125,8 @@ FALLBACK_ELF_MIB=	kern.fallback_elf_bran
 LINUX_ELF=		3
 PREVIOUS_ELF!=		/sbin/sysctl -n ${FALLBACK_ELF_MIB}
 
-# FIXME. This will result in a file at /compat/linux/etcnsswitch.conf.dist (sic!)
-RPMFLAGS+=	--relocate /etc/nsswitch.conf=/etc/nsswitch.conf.dist --badreloc
+# FIXME: The double-// can go away, once we deprecate rpm-3
+RPMFLAGS+=	--relocate /etc/nsswitch.conf=/etc//nsswitch.conf.dist --badreloc
 
 do-install:
 #
@@ -145,7 +145,6 @@ do-install:
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
-	@${MV} ${PREFIX}/etcnsswitch.conf.dist ${PREFIX}/etc/nsswitch.conf.dist
 	@test -f ${PREFIX}/etc/nsswitch.conf || cp ${PREFIX}/etc/nsswitch.conf.dist \
 		${PREFIX}/etc/nsswitch.conf
 	@${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \


More information about the freebsd-emulation mailing list