From 42cae13c130254beaca4f8467ab204f434910966 Mon Sep 17 00:00:00 2001
From: marino <marino@FreeBSD.org>
Date: Sun, 23 Mar 2014 07:30:55 +0000
Subject: lang/moscow_ml: Really add stage support this time

Only files installed in the post-install target were being placed in
stage directory.  All the files installed in the install target were
being put at ${PREFIX}, and this is most of them.  Strangely, portsmon
never complained about this.
---
 lang/moscow_ml/Makefile                 |  2 +-
 lang/moscow_ml/files/patch-Makefile.inc | 30 ++++++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'lang')

diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 108f287e5e75..803caf617c34 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	moscow_ml
 PORTVERSION=	2.01
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	http://www.itu.dk/~sestoft/mosml/
 DISTNAME=	mos201src
diff --git a/lang/moscow_ml/files/patch-Makefile.inc b/lang/moscow_ml/files/patch-Makefile.inc
index 6385816adf1c..a42d148b6599 100644
--- a/lang/moscow_ml/files/patch-Makefile.inc
+++ b/lang/moscow_ml/files/patch-Makefile.inc
@@ -1,15 +1,14 @@
---- Makefile.inc.orig	Mon Jan 19 16:03:37 2004
-+++ Makefile.inc	Tue Feb  3 21:01:10 2004
-@@ -2,7 +2,7 @@
+--- Makefile.inc.orig	2004-01-19 15:03:37.000000000 +0000
++++ Makefile.inc
+@@ -2,7 +2,6 @@
  
  # Where to install stuff
  
 -MOSMLHOME=${HOME}/mosml
-+#MOSMLHOME=${HOME}/mosml
  
  # Various utility programs
  INSTALL_PROGRAM=cp
-@@ -15,7 +15,7 @@
+@@ -15,7 +14,7 @@ PERL=perl
  
  ADDPRIMS=dynlib.c
  ADDOBJS=dynlib.o
@@ -18,7 +17,7 @@
  ADDRUNCFLAGS=
  ADDDYNLIBCFLAGS=
  
-@@ -45,13 +45,14 @@
+@@ -45,13 +44,14 @@ DYNLD=ld -shared
  
  # For NetBSD, use:
  # ------------------------
@@ -40,7 +39,7 @@
  
  # For Solaris 2 (not SunOS 4), use:
  # ---------------------------------
-@@ -113,13 +113,16 @@
+@@ -113,13 +113,11 @@ SHELL=/bin/sh
  # INCDIR contains the runtime system header files (for compiling dynlibs)
  # DOCDIR contains documentation
  
@@ -51,20 +50,15 @@
 -TOOLDIR=${MOSMLHOME}/tools
 -# LIBDIR=${MOSMLHOME}/lib/moscow_ml
 -# TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
-+#BINDIR=${MOSMLHOME}/bin
-+BINDIR=${PREFIX}/bin
-+#LIBDIR=${MOSMLHOME}/lib
-+LIBDIR=${PREFIX}/lib/mosml
-+#INCDIR=${MOSMLHOME}/include
-+INCDIR=${PREFIX}/include/mosml
-+#DOCDIR=${MOSMLHOME}/doc
-+DOCDIR=${DOCSDIR}
-+#TOOLDIR=${MOSMLHOME}/tools
-+TOOLDIR=${PREFIX}/libexec/mosml
++BINDIR=${DESTDIR}${PREFIX}/bin
++LIBDIR=${DESTDIR}${PREFIX}/lib/mosml
++INCDIR=${DESTDIR}${PREFIX}/include/mosml
++DOCDIR=${DESTDIR}${DOCSDIR}
++TOOLDIR=${DESTDIR}${PREFIX}/libexec/mosml
  
  CAMLRT=../runtime
  
-@@ -142,7 +145,7 @@
+@@ -142,7 +140,7 @@ MOSMLDEP=../camlrunm ../mosmldep
  # For cross-compiling to Win 32 (from Linux) (development only)
  # CPP=/lib/cpp -P -traditional -Umsdos -Uunix -Dwin32
  
-- 
cgit