3 files changed, 26 insertions, 6 deletions

diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile
index dd83a4dd6294..27da9d877802 100644
--- a/lang/modula3/Makefile
+++ b/lang/modula3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	modula3
 PORTVERSION=	5.10.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/m3/:boot
 DISTFILES=	${SRCDISTFILE} ${BOOTDIST}
@@ -39,8 +40,15 @@ MAKE_ENV=	CM3_DEBUG=yes \
 		M3_PORTABLE_RUN_PATH=yes
 INTERMED=	${WRKDIR}/intermediate
 BOOTCM3=	CM3="${WRKDIR}/bootstrap/bin/cm3"
-STRIPPKG=	m3back cm3 libdump cmpfp formsview vorun PklFonts dummy test
 PORTDOCS=	www license
+STRIPPKG=	m3staloneback/m3back \
+		libdump/libdump \
+		cmpfp/cmpfp \
+		formsview/formsview \
+		vorun/vorun \
+		pkl-fonts/PklFonts \
+		hack/dummy \
+		test/test
 
 .include <bsd.port.pre.mk>
 
@@ -102,16 +110,21 @@ do-install:
 	${MV} ${STAGEDIR}${PREFIX}/cm3/man ${STAGEDIR}${PREFIX}/
 	${MV} ${STAGEDIR}${PREFIX}/cm3/www ${STAGEDIR}${DOCSDIR}/
 	${MV} ${STAGEDIR}${PREFIX}/cm3/license ${STAGEDIR}${DOCSDIR}/
-	${FIND} ${STAGEDIR}${PREFIX}/cm3/pkg -type f -perm +111 \
-		-not -name cm3 | ${XARGS} ${CHMOD} -x
+	${CHMOD} -x ${STAGEDIR}${PREFIX}/cm3/pkg/m3back/src/M3C.i3 \
+		${STAGEDIR}${PREFIX}/cm3/pkg/m3core/src/C/Common/Csetjmp.i3
 	(cd ${STAGEDIR}${PREFIX}/cm3/bin && ${FIND} * -type f -perm +111 | \
 		${SED} -E '/^(obliq|obliqsrv|recordheap)$$/d' | \
 		${XARGS} ${STRIP_CMD})
 	${FIND} ${STAGEDIR}${PREFIX}/cm3/lib -type f -perm +111 | \
 		${XARGS} ${STRIP_CMD}
 .for PACKAGE in ${STRIPPKG}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/cm3/pkg/*/${M3TARGET}/${PACKAGE}
+	(cd ${STAGEDIR}${PREFIX}/cm3/pkg/${PACKAGE:H}/${M3TARGET} && \
+		${STRIP_CMD} ${PACKAGE:T} && \
+		${MV} ${PACKAGE:T} ../../../bin/ && \
+		${LN} -s ../../../bin/${PACKAGE:T} .)
 .endfor
+	(cd ${STAGEDIR}${PREFIX}/cm3/pkg/cm3/${M3TARGET} && \
+		${RM} cm3 && ${LN} -s ../../../bin/cm3 .)
 
 new-bootstrap:
 	@${RM} -rf ${NEWBOOTDIR}
diff --git a/lang/modula3/files/patch-m3-sys_cminstall_src_config-no-install_FreeBSD.common b/lang/modula3/files/patch-m3-sys_cminstall_src_config-no-install_FreeBSD.common
index ef0a56f84885..1c30dee8a36a 100644
--- a/lang/modula3/files/patch-m3-sys_cminstall_src_config-no-install_FreeBSD.common
+++ b/lang/modula3/files/patch-m3-sys_cminstall_src_config-no-install_FreeBSD.common
@@ -1,6 +1,6 @@
 --- m3-sys/cminstall/src/config-no-install/FreeBSD.common.orig	2015-06-02 07:41:14 UTC
 +++ m3-sys/cminstall/src/config-no-install/FreeBSD.common
-@@ -8,32 +8,12 @@ SYSTEM_LIBS{"ODBC"} = [ "-Wl,-R/usr/loca
+@@ -8,32 +8,11 @@ SYSTEM_LIBS{"ODBC"} = [ "-Wl,-R/usr/loca
  SYSTEM_LIBS{"POSTGRES95"} = [ "-Wl,-R/usr/local/lib", "-L/usr/local/lib", "-lpq" ]
  SYSTEM_LIBS{"X11"} = ["-Wl,-R/usr/local/lib", "-L/usr/local/lib", SYSTEM_LIBS{"X11"}]
  
@@ -36,7 +36,6 @@
 +  & " -Wl,-z,origin"
 +  & " -Bsymbolic"
 +  & " -Wl,--fatal-warnings"
-+  & " -Wl,-rpath,\\$ORIGIN"
 +  & " -Wl,-rpath,\\$ORIGIN/../lib"
  
  include("gnuld.common")
diff --git a/lang/modula3/pkg-plist b/lang/modula3/pkg-plist
index 3ff247c245ea..6c2bccfbc629 100644
--- a/lang/modula3/pkg-plist
+++ b/lang/modula3/pkg-plist
@@ -4,6 +4,7 @@
 %%B%%/DeckScape
 %%B%%/Fours
 %%B%%/Juno
+%%B%%/PklFonts
 %%B%%/Proxy
 %%B%%/RehearseCode
 %%B%%/WebScape
@@ -11,6 +12,7 @@
 %%B%%/cm3.cfg
 %%B%%/cm3cg
 %%B%%/cm3ide
+%%B%%/cmpfp
 %%B%%/cmpdir
 %%B%%/columns
 %%B%%/config/ALPHA32_VMS
@@ -91,15 +93,19 @@
 %%B%%/cvsup
 %%B%%/cvsupd
 %%B%%/dirfp
+%%B%%/dummy
 %%B%%/fisheye
 %%B%%/fix_nl
 %%B%%/formsedit
+%%B%%/formsview
 %%B%%/kemacs
 %%B%%/kext
 %%B%%/kgv
 %%B%%/klex
 %%B%%/ktok
 %%B%%/kyacc
+%%B%%/libdump
+%%B%%/m3back
 %%B%%/m3browser
 %%B%%/m3browserhack
 %%B%%/m3bundle
@@ -137,10 +143,12 @@
 %%B%%/solitaire
 %%B%%/stablegen
 %%B%%/stubgen
+%%B%%/test
 %%B%%/tetris
 %%B%%/visobliq
 %%B%%/vocgi
 %%B%%/voquery
+%%B%%/vorun
 %%B%%/webcat
 %%L%%/libBitVector.a
 %%L%%/libBitVector.so