head	1.6;
access;
symbols
	pkgsrc-2026Q1:1.6.0.100
	pkgsrc-2026Q1-base:1.6
	pkgsrc-2025Q4:1.6.0.98
	pkgsrc-2025Q4-base:1.6
	pkgsrc-2025Q3:1.6.0.96
	pkgsrc-2025Q3-base:1.6
	pkgsrc-2025Q2:1.6.0.94
	pkgsrc-2025Q2-base:1.6
	pkgsrc-2025Q1:1.6.0.92
	pkgsrc-2025Q1-base:1.6
	pkgsrc-2024Q4:1.6.0.90
	pkgsrc-2024Q4-base:1.6
	pkgsrc-2024Q3:1.6.0.88
	pkgsrc-2024Q3-base:1.6
	pkgsrc-2024Q2:1.6.0.86
	pkgsrc-2024Q2-base:1.6
	pkgsrc-2024Q1:1.6.0.84
	pkgsrc-2024Q1-base:1.6
	pkgsrc-2023Q4:1.6.0.82
	pkgsrc-2023Q4-base:1.6
	pkgsrc-2023Q3:1.6.0.80
	pkgsrc-2023Q3-base:1.6
	pkgsrc-2023Q2:1.6.0.78
	pkgsrc-2023Q2-base:1.6
	pkgsrc-2023Q1:1.6.0.76
	pkgsrc-2023Q1-base:1.6
	pkgsrc-2022Q4:1.6.0.74
	pkgsrc-2022Q4-base:1.6
	pkgsrc-2022Q3:1.6.0.72
	pkgsrc-2022Q3-base:1.6
	pkgsrc-2022Q2:1.6.0.70
	pkgsrc-2022Q2-base:1.6
	pkgsrc-2022Q1:1.6.0.68
	pkgsrc-2022Q1-base:1.6
	pkgsrc-2021Q4:1.6.0.66
	pkgsrc-2021Q4-base:1.6
	pkgsrc-2021Q3:1.6.0.64
	pkgsrc-2021Q3-base:1.6
	pkgsrc-2021Q2:1.6.0.62
	pkgsrc-2021Q2-base:1.6
	pkgsrc-2021Q1:1.6.0.60
	pkgsrc-2021Q1-base:1.6
	pkgsrc-2020Q4:1.6.0.58
	pkgsrc-2020Q4-base:1.6
	pkgsrc-2020Q3:1.6.0.56
	pkgsrc-2020Q3-base:1.6
	pkgsrc-2020Q2:1.6.0.52
	pkgsrc-2020Q2-base:1.6
	pkgsrc-2020Q1:1.6.0.32
	pkgsrc-2020Q1-base:1.6
	pkgsrc-2019Q4:1.6.0.54
	pkgsrc-2019Q4-base:1.6
	pkgsrc-2019Q3:1.6.0.50
	pkgsrc-2019Q3-base:1.6
	pkgsrc-2019Q2:1.6.0.48
	pkgsrc-2019Q2-base:1.6
	pkgsrc-2019Q1:1.6.0.46
	pkgsrc-2019Q1-base:1.6
	pkgsrc-2018Q4:1.6.0.44
	pkgsrc-2018Q4-base:1.6
	pkgsrc-2018Q3:1.6.0.42
	pkgsrc-2018Q3-base:1.6
	pkgsrc-2018Q2:1.6.0.40
	pkgsrc-2018Q2-base:1.6
	pkgsrc-2018Q1:1.6.0.38
	pkgsrc-2018Q1-base:1.6
	pkgsrc-2017Q4:1.6.0.36
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.6.0.34
	pkgsrc-2017Q3-base:1.6
	pkgsrc-2017Q2:1.6.0.30
	pkgsrc-2017Q2-base:1.6
	pkgsrc-2017Q1:1.6.0.28
	pkgsrc-2017Q1-base:1.6
	pkgsrc-2016Q4:1.6.0.26
	pkgsrc-2016Q4-base:1.6
	pkgsrc-2016Q3:1.6.0.24
	pkgsrc-2016Q3-base:1.6
	pkgsrc-2016Q2:1.6.0.22
	pkgsrc-2016Q2-base:1.6
	pkgsrc-2016Q1:1.6.0.20
	pkgsrc-2016Q1-base:1.6
	pkgsrc-2015Q4:1.6.0.18
	pkgsrc-2015Q4-base:1.6
	pkgsrc-2015Q3:1.6.0.16
	pkgsrc-2015Q3-base:1.6
	pkgsrc-2015Q2:1.6.0.14
	pkgsrc-2015Q2-base:1.6
	pkgsrc-2015Q1:1.6.0.12
	pkgsrc-2015Q1-base:1.6
	pkgsrc-2014Q4:1.6.0.10
	pkgsrc-2014Q4-base:1.6
	pkgsrc-2014Q3:1.6.0.8
	pkgsrc-2014Q3-base:1.6
	pkgsrc-2014Q2:1.6.0.6
	pkgsrc-2014Q2-base:1.6
	pkgsrc-2014Q1:1.6.0.4
	pkgsrc-2014Q1-base:1.6
	pkgsrc-2013Q4:1.6.0.2
	pkgsrc-2013Q4-base:1.6
	pkgsrc-2013Q3:1.5.0.16
	pkgsrc-2013Q3-base:1.5
	pkgsrc-2013Q2:1.5.0.14
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2013Q1:1.5.0.12
	pkgsrc-2013Q1-base:1.5
	pkgsrc-2012Q4:1.5.0.10
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2012Q3:1.5.0.8
	pkgsrc-2012Q3-base:1.5
	pkgsrc-2012Q2:1.5.0.6
	pkgsrc-2012Q2-base:1.5
	pkgsrc-2012Q1:1.5.0.4
	pkgsrc-2012Q1-base:1.5
	pkgsrc-2011Q4:1.5.0.2
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q3:1.3.0.28
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.26
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.24
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.22
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.20
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.18
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.16
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.14
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.12
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.10
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.8
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.6
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.4
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.2
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.36
	pkgsrc-2008Q1:1.2.0.34
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.32
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.30
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.28
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.26
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.24
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.22
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.20
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.18
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.16
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.14
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.12
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.10
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.8
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.6
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.4
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.2
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.1.1.1.0.10
	pkgsrc-2003Q4-base:1.1.1.1
	netbsd-1-6-1:1.1.1.1.0.6
	netbsd-1-6-1-base:1.1.1.1
	netbsd-1-6:1.1.1.1.0.8
	netbsd-1-6-RELEASE-base:1.1.1.1
	pkgviews:1.1.1.1.0.4
	pkgviews-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	buildlink2-base:1.1.1.1
	netbsd-1-5-PATCH003:1.1.1.1
	netbsd-1-5-PATCH001:1.1.1.1
	netbsd-1-5-RELEASE:1.1.1.1
	netbsd-1-4-PATCH003:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2013.10.27.20.32.56;	author joerg;	state Exp;
branches;
next	1.5;
commitid	A972PBWx6MMzmYax;

1.5
date	2011.11.02.15.04.17;	author dholland;	state Exp;
branches;
next	1.4;

1.4
date	2011.11.01.11.39.59;	author bsiegert;	state Exp;
branches;
next	1.3;

1.3
date	2008.09.05.02.07.51;	author dholland;	state Exp;
branches;
next	1.2;

1.2
date	2004.03.20.22.35.04;	author bouyer;	state Exp;
branches;
next	1.1;

1.1
date	2000.06.21.11.42.47;	author bouyer;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.06.21.11.42.47;	author bouyer;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Don't force -fno-defer-pop.
@
text
@$NetBSD: patch-aa,v 1.5 2011/11/02 15:04:17 dholland Exp $

Config fixes.
Destdir support.

--- Makefile.orig	1997-04-24 10:51:03.000000000 -0400
+++ Makefile	2008-09-04 21:28:01.000000000 -0400
@@@@ -7,7 +7,7 @@@@ CC=gcc
 # Additional options to $(CC).
 # If you are using gcc, add -fno-defer-pop.
 # This option circumvents a gcc bug on some platforms (680x0, 80386).
-OPTS=-fno-defer-pop
+OPTS= -Dunix
 
 # Extra libraries that have to be linked with the runtime system.
 # The math library "-lm" is linked by default.
@@@@ -24,19 +24,19 @@@@ LIBS=
 # not all Unix C preprocessors define it.
 # If your cpp is too fussy, make tools/clprepro and use this:
 # CPP=../../src/tools/clprepro -Dunix
-CPP=/lib/cpp -P -Dunix
+CPP=cpp -P -C -Dunix
 
 # The directory where public executables will be installed
-BINDIR=/usr/local/bin
+BINDIR=${PREFIX}/bin
 
 # The directory where the Caml Light standard library will be installed
-LIBDIR=/usr/local/lib/caml-light
+LIBDIR=${PREFIX}/lib/caml-light
 
 # The manual section where the manual pages will be installed
 MANEXT=1
 
 # The directory where the manual pages will be installed
-MANDIR=/usr/local/man/man$(MANEXT)
+MANDIR=${PREFIX}/${PKGMANDIR}/man$(MANEXT)
 
 # Some "make"s need this to ensure that they call the Bourne shell,
 # not the C shell. Seems harmless on most other "make"s.
@@@@ -49,7 +49,7 @@@@ SUBDIRS=runtime launch lib compiler link
 
 # Configure the system
 configure:
-	cd ../config; sh autoconf "$(CC) $(OPTS) $(LIBS)"
+	cd ../config; sh ./autoconf "$(CC) $(OPTS) $(LIBS)"
 
 # Build the system for the first time
 world:
@@@@ -118,8 +118,8 @@@@ compile:
 
 # Install the Caml Light system
 install:
-	if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
-	if test -d $(LIBDIR); then : ; else mkdir $(LIBDIR); fi
+	if test -d $(DESTDIR)$(BINDIR); then : ; else mkdir $(DESTDIR)$(BINDIR); fi
+	if test -d $(DESTDIR)$(LIBDIR); then : ; else mkdir $(DESTDIR)$(LIBDIR); fi
 	cd runtime; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
 	cd launch; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
 	cd lib; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
@@@@ -130,13 +130,13 @@@@ install:
 	cd lex; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
 	cd yacc; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
 	cd man; make MANDIR=$(MANDIR) MANEXT=$(MANEXT) install
-	cp camlmsgs.txt $(LIBDIR)
+	cp camlmsgs.txt $(DESTDIR)$(LIBDIR)
 
 # Remove the Caml Light system after installation
 uninstall:
-	rm -rf $(LIBDIR)
-	rm -f $(BINDIR)/camlrun $(BINDIR)/camlc $(BINDIR)/camllight
-	rm -f $(BINDIR)/camlyacc $(BINDIR)/camllex $(BINDIR)/camlmktop
+	rm -rf $(DESTDIR)$(LIBDIR)
+	rm -f $(DESTDIR)$(BINDIR)/camlrun $(DESTDIR)$(BINDIR)/camlc $(DESTDIR)$(BINDIR)/camllight
+	rm -f $(DESTDIR)$(BINDIR)/camlyacc $(DESTDIR)$(BINDIR)/camllex $(DESTDIR)$(BINDIR)/camlmktop
 
 # Remove all generated files
 clean:
@


1.5
log
@Improve previous, builds again on netbsd now.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.4 2011/11/01 11:39:59 bsiegert Exp $
d13 1
a13 1
+OPTS= -Dunix -fno-defer-pop
@


1.4
log
@cpp is /usr/libexec/cpp in MirBSD. Fixes build.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.3 2008/09/05 02:07:51 dholland Exp $
d22 1
a22 1
+CPP?=cpp -P -C -Dunix
@


1.3
log
@Fix broken 64-bit build. Add destdir support.
PKGREVISION++, because I changed some things around.
@
text
@d1 1
a1 1
$NetBSD$
d22 1
a22 1
+CPP=cpp -P -C -Dunix
@


1.2
log
@Change 'sh autoconf' to 'sh ./autoconf'. Solaris's sh will pick up autoconf
from PATH otherwise (well, the author should probably not have called this
script "autoconf" :)
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1.1.1 2000/06/21 11:42:47 bouyer Exp $
d3 6
a8 3
--- Makefile.orig	1997-04-24 16:51:03.000000000 +0200
+++ Makefile	2004-03-08 01:07:53.010550000 +0100
@@@@ -7,7 +7,7 @@@@
d17 1
a17 1
@@@@ -24,19 +24,19 @@@@
d37 1
a37 1
+MANDIR=${PREFIX}/man/man$(MANEXT)
d41 1
a41 1
@@@@ -49,7 +49,7 @@@@
d50 29
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: $
d3 2
a4 2
--- Makefile.orig	Thu Apr 24 16:51:03 1997
+++ Makefile	Mon Jun 19 11:26:56 2000
d38 9
@


1.1.1.1
log
@Initial import of caml-light, another caml implementation.
@
text
@@