ports/187508: [PATCH] lang/visualworks: Stage

[Johannes Jost Meixner]

>Number:         187508
>Category:       ports
>Synopsis:       [PATCH] lang/visualworks: Stage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 12 20:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Johannes Jost Meixner
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #4: Sun Mar  9 15:34:03 EET
>Description:
- Stagify
- Small Makefile cleanup

Generated with FreeBSD Port Tools 1.00.2014.03.12 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- visualworks-7.6.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 348000)
+++ Makefile	(working copy)
@@ -4,19 +4,20 @@
 PORTNAME=		visualworks
 PORTVERSION=		7.6
 CATEGORIES=		lang linux
-SUBDIR=			vwnc${PORTVERSION}
 MASTER_SITES=		http://www.cincomsmalltalk.com/bsdports/${SUBDIR}.old/
 DISTFILES=		BaseVisualWorks.tar.gz \
 			VM-Linux86.tar.gz
-DIST_SUBDIR=		${SUBDIR}
 EXTRACT_ONLY=
 
 MAINTAINER=		ports at FreeBSD.org
 COMMENT=		A high performance Smalltalk environment
 
+DIST_SUBDIR=		${SUBDIR}
+SUBDIR=			vwnc${PORTVERSION}
+
 USE_LINUX=		yes
 USE_LINUX_APPS=		xorglibs
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		yes
 PLIST_FILES=		bin/visual
 MY_STARTUP_SCRIPT=	visual.sh
@@ -23,9 +24,9 @@
 
 RESTRICTED=		Redistribution is probably not permitted
 
-OPTIONS_DEFINE=	ATOOLS COM DLLC DST DATABASE DOTNET CONTRIBUTED ARAGON COAST DOME JUN 3D \
+OPTIONS_DEFINE=	ATOOLS COM DLLC DST DATABASE DOTNET CONTRIBUTED ARAGON COAST DOME JUN \
 		SEASIDE SILVERMARK GEMSTONE I18N OBSOLETE OPENTALK PLUGIN PREVIEW STORE  \
-		WEBAPP WEBSERVICES VMLINUX VMWINDOWS VMMAC VMSOLARIS VMAIX VMHPUX VMSGI 
+		WEBAPP WEBSERVICES VMLINUX VMWINDOWS VMMAC VMSOLARIS VMAIX VMHPUX VMSGI
 OPTIONS_DEFAULT=	DLLC DATABASE SEASIDE STORE
 
 ATOOLS_DESC=	Advanced Tools
@@ -58,7 +59,6 @@
 VMHPUX_DESC=	Virtual Machine for HPUX
 VMSGI_DESC=	Virtual Machine for SGI
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if make(makesum) || defined(FETCH_ALL) || ${PORT_OPTIONS:MATOOLS}
@@ -155,19 +155,19 @@
 .endif
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@for f in ${DISTFILES}; do tar xzpf ${DISTDIR}/${DIST_SUBDIR}/$$f -C ${DATADIR}; done
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@for f in ${DISTFILES}; do tar xzpf ${DISTDIR}/${DIST_SUBDIR}/$$f -C ${STAGEDIR}${DATADIR}; done
 	@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/${MY_STARTUP_SCRIPT}
 	@${ECHO_CMD} "VISUALWORKS=${DATADIR}" >> ${WRKDIR}/${MY_STARTUP_SCRIPT}
 	@${ECHO_CMD} "export VISUALWORKS" >> ${WRKDIR}/${MY_STARTUP_SCRIPT}
 	@${ECHO_CMD} "${DATADIR}/bin/linux86/visual \$$*" >> ${WRKDIR}/${MY_STARTUP_SCRIPT}
-	@${INSTALL_SCRIPT} ${WRKDIR}/${MY_STARTUP_SCRIPT} ${DATADIR}
-	@${LN} -s ${DATADIR}/${MY_STARTUP_SCRIPT} ${PREFIX}/bin/visual
+	@${INSTALL_SCRIPT} ${WRKDIR}/${MY_STARTUP_SCRIPT} ${STAGEDIR}${DATADIR}
+	@${LN} -s ${DATADIR}/${MY_STARTUP_SCRIPT} ${STAGEDIR}${PREFIX}/bin/visual
 
 post-install:
-	@${FIND} ${DATADIR} -not -type d \
+	@${FIND} ${STAGEDIR}${DATADIR} -not -type d \
 	  | ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
-	@${FIND} -d ${DATADIR} -type d \
+	@${FIND} -d ${STAGEDIR}${DATADIR} -type d \
 	  | ${SED} -ne 's,^${DATADIR}, at dirrm share/${PORTNAME},p' >> ${TMPPLIST}
 	@${ECHO_MSG} " "
 	@${ECHO_MSG} " --------------------------- Please note: ---------------------------"
--- visualworks-7.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: