ports/57203: a few files in the 1.1 port had the wrong path (the build path)

[Berend de Boer]

>Number:         57203
>Category:       ports
>Synopsis:       a few files in the 1.1 port had the wrong path (the build path)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 25 00:20:21 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     User &
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD bmach.nederware.nl 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #18: Mon Sep 22 17:43:41 NZST 2003 berend at bmach.nederware.nl:/usr/src/sys/compile/BMACH i386


	
>Description:
	The system.se and loadpath.se files had the build path instead of
	the install path. This patch corrects this issuse.
	Also the loadpath.UNIX file was no longer applicable.
	This isn't an issue for people using the Gobo geant build system,
	but for pure SmartEiffel users the port didn't work.
>How-To-Repeat:

>Fix:

	Apply the following patches.

1. Makefile


--- Makefile.orig	Fri Jun 20 00:02:14 2003
+++ Makefile	Thu Sep 25 18:21:06 2003
@@ -47,26 +47,16 @@
 	${LN} -fs ${SEDIR} ${ALIASDIR})
 	@(if ${TEST} -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
 		${MKDIR} ${SEDIR}; \
-		${CP} -pR ${WRKSRC}/* ${SEDIR}; \
-		${ECHO_CMD} ./ > ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/kernel/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/base/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/io/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/random/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/number/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/sorting/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/time/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/scoop/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/lib/misc/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/expression/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/instruction/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/e_type/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/feature/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/run_feature/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tools/misc/ >> ${SEDIR}/sys/loadpath.UNIX; \
-		${ECHO_CMD} ${SEDIR}/tutorial/ >> ${SEDIR}/sys/loadpath.UNIX)
+		${CP} -pR ${WRKSRC}/* ${SEDIR})
+	@${SED} -i .orig -e "s,${WRKSRC},${SEDIR},g" ${SEDIR}/sys/system.se
+	@${RM} ${SEDIR}/sys/system.se.orig
+	@${SED} -i .orig -e "s,${WRKSRC},${SEDIR},g" ${SEDIR}/lib/loadpath.se
+	@${RM} ${SEDIR}/lib/loadpath.se.orig
+	@${SED} -i .orig -e "s,${WRKSRC},${SEDIR},g" ${SEDIR}/tools/loadpath.se
+	@${RM} ${SEDIR}/tools/loadpath.se.orig
+	@${SED} -i .orig -e "s,${WRKSRC},${SEDIR},g" ${SEDIR}/tutorial/loadpath.se
+	@${RM} ${SEDIR}/tutorial/loadpath.se.orig
+
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \



2. pkg-plist


--- pkg-plist.orig	Fri Jun 20 00:02:14 2003
+++ pkg-plist	Thu Sep 25 18:21:55 2003
@@ -989,5 +989,4 @@
 smarteiffel-%%PORTVERSION%%/sys/READ_ME
 smarteiffel-%%PORTVERSION%%/sys/system.se
-smarteiffel-%%PORTVERSION%%/sys/loadpath.UNIX
 smarteiffel-%%PORTVERSION%%/tutorial/basic_directory/example1.e
 smarteiffel-%%PORTVERSION%%/tutorial/basic_directory/example2.e
>Release-Note:
>Audit-Trail:
>Unformatted: