Attachment #69130 for bug #101398

View | Details | Raw Unified | Return to bug 101398
Collapse All | Expand All





PORTNAME=	caml
PORTVERSION=	0.75
PORTREVISION=	1
CATEGORIES=	lang elisp
MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \

USE_XLIB=	yes
WRKSRC=		${WRKDIR}/cl75
ALL_TARGET=	configure world bootstrap
MAN1=		camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 \
		camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1

.include <bsd.port.pre.mk>



# build some contrib stuff too
do-install:
	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} \
		PREFIX=${PREFIX} X11BASE=${X11BASE}
	cd ${WRKSRC}/contrib;${SETENV} ${MAKE_ENV} ${MAKE} all \
		${INSTALL_TARGET} PREFIX=${PREFIX} X11BASE=${X11BASE}

.include <bsd.port.post.mk>




--- src/Makefile.orig	Wed Mar  3 16:25:57 1999
+++ src/Makefile	Sat Aug  5 09:56:37 2006
@@ -2,14 +2,14 @@
 
 # Which C compiler to use.
 # Performance is often improved if you use gcc 2.x instead of cc.
-CC=gcc
+#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).
 # If you are using Linux with libc6 (RedHat 5, Debian 2), add -D__FAVOR_BSD
 # This option avoids signal-related problems.
-OPTS=-fno-defer-pop -D__FAVOR_BSD
+OPTS=-fno-defer-pop -D__FAVOR_BSD ${CFLAGS}
 
 # Extra libraries that have to be linked with the runtime system.
 # The math library "-lm" is linked by default.
@@ -26,19 +26,19 @@
 # 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 -traditional -Dunix
+CPP=/usr/bin/cpp -P -traditional -Dunix ${CPPFLAGS}
 
 # The directory where public executables will be installed
-BINDIR=/usr/local/bin




--- contrib/Makefile.orig	Sun Nov 12 02:57:42 2000
+++ contrib/Makefile	Sat Aug  5 09:57:42 2006
@@ -5,24 +5,24 @@
 # Remember that "libunix" is required for
 # "debugger", "libgraph", "camltk", "camltk4", and "search_isos".
 PACKAGES=libunix libgraph debugger libnum libstr mletags \

 # caml-tex
 # caml-latex2e
 # camltk
 
 # Which C compiler to use.
 # Should be the same compiler used to compile the main system (../src).
-CC=gcc
+#CC=gcc
 
 # Any additional options to $(CC).
-OPTS=
+OPTS=${CFLAGS}
 
 # How to call the C preprocessor on a file that does not have the .c extension.
 # That's /lib/cpp on most machines, sometimes /usr/bin/cpp,
 # and /usr/ccs/lib/cpp under Solaris.
 # The -P option suppresses the generation of "# linenum" directives,
 # which are not understood by Caml Light.

Lines 1-8 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-ad (-3 / +4 lines)
1	--- src/man/Makefile-- Tue Nov 1 23:06:06 1994	1	--- src/man/Makefile.orig Tue Nov 1 20:36:06 1994
2	+++ src/man/Makefile Tue Jul 28 08:50:22 1998	2	+++ src/man/Makefile Sat Aug 5 09:59:15 2006
3	@@ -3,4 +3,5 @@	3	@@ -3,4 +3,5 @@
4	MANDIR=/usr/man/man$(MANEXT)	4	MANDIR=/usr/man/man$(MANEXT)
5		5
6	install:	6	install:
		7	- for f in $(MAN); do cp $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done
7	+ mkdir -p ${MANDIR}	8	+ mkdir -p ${MANDIR}
8	for f in $(MAN); do cp $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done	9	+ for f in $(MAN); do ${BSD_INSTALL_MAN} $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done




--- contrib/camlmode/Makefile.orig	Mon Dec  2 19:43:37 1996
+++ contrib/camlmode/Makefile	Sat Aug  5 10:00:05 2006
@@ -11,8 +11,8 @@
 all:
 
 install:
-	cp $(FILES) $(EMACSLISPDIR)
 	cp $(FILES) $(EMACSLISPDIR)
-	dir=`pwd`; cd $(EMACSLISPDIR); $(EMACS) -batch -l $$dir/compile
+	mkdir -p $(EMACSLISPDIR)
+	${BSD_INSTALL_DATA} $(FILES) $(EMACSLISPDIR)
 
 clean:
 	rm -f *~ #*#

Lines 1-7 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-af (-3 / +4 lines)
1	--- contrib/camlsearch/emacs-lisp/Makefile-- Sat Feb 4 23:42:23 1995	1	--- contrib/camlsearch/emacs-lisp/Makefile.orig Sat Feb 4 21:12:23 1995
2	+++ contrib/camlsearch/emacs-lisp/Makefile Tue Jul 28 08:49:53 1998	2	+++ contrib/camlsearch/emacs-lisp/Makefile Sat Aug 5 10:00:54 2006
3	@@ -1,3 +1,4 @@	3	@@ -1,3 +1,4 @@
4	SOURCES=caml-search.el	4	SOURCES=caml-search.el
5	install: $(SOURCES)	5	install: $(SOURCES)
		6	- cp $(SOURCES) $(ELISPDIR)
6	+ mkdir -p $(ELISPDIR)	7	+ mkdir -p $(ELISPDIR)
7	cp $(SOURCES) $(ELISPDIR)	8	+ ${BSD_INSTALL_DATA} $(SOURCES) $(ELISPDIR)




--- contrib/caml-tex/Makefile.orig	Sat Aug  5 10:01:47 2006
+++ contrib/caml-tex/Makefile	Sat Aug  5 10:02:30 2006
@@ -7,9 +7,9 @@
 all:
 
 install:
-	- cp caml-tex $(BINDIR)/caml-tex
-	- cp caml.sty caml-sl.sty $(TEXINPUTDIR)
-	- cp caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
+	- ${BSD_INSTALL_DATA} caml-tex $(BINDIR)/caml-tex
+	- ${BSD_INSTALL_DATA} caml.sty caml-sl.sty $(TEXINPUTDIR)
+	- ${BSD_INSTALL_MAN} caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
 
 caml-tex.doc: caml-tex.1
 	nroff -man caml-tex.1 | sed -e 's/_//g' > caml-tex.doc




--- contrib/libnum/bignum/Makefile.orig	Sat Aug  5 10:03:23 2006
+++ contrib/libnum/bignum/Makefile	Sat Aug  5 10:05:03 2006
@@ -4,7 +4,7 @@
 #       modified_on Thu Nov  2 14:23:14 GMT+1:00 1989 by gangnet 
 #       modified_on Wed Jul  5 10:23:54 GMT+2:00 1989 by bertin 
 
-CC = cc
+#CC = cc
 AR = ar
 RANLIB = ranlib
 RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
@@ -327,7 +327,7 @@
 	rm -f bignum.00.shar
 	$(SENDMAIL) $(SENDMAILFLAGS) $(USER) <tosend
 	for i in `ls bignum.[0-9][0-9].shar`; \
-	    do cp sendmail_header tosend; \
+	    do ${BSD_INSTALL_DATA} sendmail_header tosend; \
 	    echo $$i | sed -e "s/^bignum0*/Subject: BigNum - Part /" >>tosend; \
 	    echo "# Remove all text above and including this line." >>tosend; \
 	    sed -e "s/modified_on/modified_on/g" <$$i >>tosend; \




--- src/launch/Makefile.orig	Sat Aug  5 10:05:58 2006
+++ src/launch/Makefile	Sat Aug  5 10:06:43 2006
@@ -17,11 +17,11 @@
 	chmod a+x /tmp/testscr
 	sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
                then echo "#!$(BINDIR)/camlrun" > $(LIBDIR)/header; \
-               else cp camlexec $(LIBDIR)/header; \
+               else ${BSD_INSTALL_SCRIPT} camlexec $(LIBDIR)/header; \
                fi'
 	rm -f /tmp/testscr
 	for script in camlc camllight camlmktop; do \
-	  cp $$script $(BINDIR)/$$script; \
+	  ${BSD_INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
 	  chmod a+x $(BINDIR)/$$script; \
 	done
 

Line 0 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-src_runtime_Makefile (+11 lines)
	1	--- src/runtime/Makefile.orig Sat Aug 5 10:17:26 2006
	2	+++ src/runtime/Makefile Sat Aug 5 10:17:30 2006
	3	@@ -3,7 +3,7 @@
	4	# These options are overriden when called from ../Makefile.
	5	CC=cc
	6	OPTS=#-fno-defer-pop
	7	-CFLAGS=-O2 $(OPTS) -I..
	8	+CFLAGS=$(OPTS) -I..
	9	LIBS=
	10
	11	# Test to see whether ranlib exists on the machine

Return to bug 101398

Lines 7-12 Link Here

(-)/var/tmp/tmp4/caml-light/Makefile (-5 / +7 lines)
7		7
8	PORTNAME= caml	8	PORTNAME= caml
9	PORTVERSION= 0.75	9	PORTVERSION= 0.75
		10	PORTREVISION= 1
10	CATEGORIES= lang elisp	11	CATEGORIES= lang elisp
11	MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/ \	12	MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/ \
12	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \	13	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \
Lines 21-27 Link Here
21	USE_XLIB= yes	22	USE_XLIB= yes
22	WRKSRC= ${WRKDIR}/cl75	23	WRKSRC= ${WRKDIR}/cl75
23	ALL_TARGET= configure world bootstrap	24	ALL_TARGET= configure world bootstrap
24	MAN1= camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1	25	MAN1= camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 \
		26	camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1
25		27
26	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
27		29
Lines 31-39 Link Here
31		33
32	# build some contrib stuff too	34	# build some contrib stuff too
33	do-install:	35	do-install:
34	cd ${WRKSRC}/src; ${MAKE} ${INSTALL_TARGET} PREFIX=${PREFIX} \	36	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} \
35	X11BASE=${X11BASE}	37	PREFIX=${PREFIX} X11BASE=${X11BASE}
36	cd ${WRKSRC}/contrib; ${MAKE} all ${INSTALL_TARGET} PREFIX=${PREFIX} \	38	cd ${WRKSRC}/contrib;${SETENV} ${MAKE_ENV} ${MAKE} all \
37	X11BASE=${X11BASE}	39	${INSTALL_TARGET} PREFIX=${PREFIX} X11BASE=${X11BASE}
38		40
39	.include <bsd.port.post.mk>	41	.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-aa (-3 / +20 lines)
1	--- src/Makefile.orig Wed Mar 3 18:55:57 1999	1	--- src/Makefile.orig Wed Mar 3 16:25:57 1999
2	+++ src/Makefile Sat Mar 6 19:51:31 2004	2	+++ src/Makefile Sat Aug 5 09:56:37 2006
		3	@@ -2,14 +2,14 @@
		4
		5	# Which C compiler to use.
		6	# Performance is often improved if you use gcc 2.x instead of cc.
		7	-CC=gcc
		8	+#CC=gcc
		9
		10	# Additional options to $(CC).
		11	# If you are using gcc, add -fno-defer-pop.
		12	# This option circumvents a gcc bug on some platforms (680x0, 80386).
		13	# If you are using Linux with libc6 (RedHat 5, Debian 2), add -D__FAVOR_BSD
		14	# This option avoids signal-related problems.
		15	-OPTS=-fno-defer-pop -D__FAVOR_BSD
		16	+OPTS=-fno-defer-pop -D__FAVOR_BSD ${CFLAGS}
		17
		18	# Extra libraries that have to be linked with the runtime system.
		19	# The math library "-lm" is linked by default.
3	@@ -26,19 +26,19 @@	20	@@ -26,19 +26,19 @@
4	# not all Unix C preprocessors define it.	21	# not all Unix C preprocessors define it.
5	# If your cpp is too fussy, make tools/clprepro and use this:	22	# If your cpp is too fussy, make tools/clprepro and use this:
6	# CPP=../../src/tools/clprepro -Dunix	23	# CPP=../../src/tools/clprepro -Dunix
7	-CPP=/lib/cpp -P -traditional -Dunix	24	-CPP=/lib/cpp -P -traditional -Dunix
8	+CPP=/usr/bin/cpp -P -traditional -Dunix	25	+CPP=/usr/bin/cpp -P -traditional -Dunix ${CPPFLAGS}
9		26
10	# The directory where public executables will be installed	27	# The directory where public executables will be installed
11	-BINDIR=/usr/local/bin	28	-BINDIR=/usr/local/bin

Lines 1-6 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-ab (-4 / +15 lines)
1	--- contrib/Makefile.orig Sat Nov 11 15:57:42 2000	1	--- contrib/Makefile.orig Sun Nov 12 02:57:42 2000
2	+++ contrib/Makefile Sat Mar 6 06:42:32 2004	2	+++ contrib/Makefile Sat Aug 5 09:57:42 2006
3	@@ -5,7 +5,7 @@	3	@@ -5,24 +5,24 @@
4	# Remember that "libunix" is required for	4	# Remember that "libunix" is required for
5	# "debugger", "libgraph", "camltk", "camltk4", and "search_isos".	5	# "debugger", "libgraph", "camltk", "camltk4", and "search_isos".
6	PACKAGES=libunix libgraph debugger libnum libstr mletags \	6	PACKAGES=libunix libgraph debugger libnum libstr mletags \
Lines 9-15 Link Here
9	# caml-tex	9	# caml-tex
10	# caml-latex2e	10	# caml-latex2e
11	# camltk	11	# camltk
12	@@ -22,7 +22,7 @@	12
		13	# Which C compiler to use.
		14	# Should be the same compiler used to compile the main system (../src).
		15	-CC=gcc
		16	+#CC=gcc
		17
		18	# Any additional options to $(CC).
		19	-OPTS=
		20	+OPTS=${CFLAGS}
		21
		22	# How to call the C preprocessor on a file that does not have the .c extension.
		23	# That's /lib/cpp on most machines, sometimes /usr/bin/cpp,
13	# and /usr/ccs/lib/cpp under Solaris.	24	# and /usr/ccs/lib/cpp under Solaris.
14	# The -P option suppresses the generation of "# linenum" directives,	25	# The -P option suppresses the generation of "# linenum" directives,
15	# which are not understood by Caml Light.	26	# which are not understood by Caml Light.

Lines 1-12 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-ae (-4 / +5 lines)
1	--- contrib/camlmode/Makefile.orig Mon Dec 2 22:13:37 1996	1	--- contrib/camlmode/Makefile.orig Mon Dec 2 19:43:37 1996
2	+++ contrib/camlmode/Makefile Thu Aug 20 08:11:56 1998	2	+++ contrib/camlmode/Makefile Sat Aug 5 10:00:05 2006
3	@@ -11,8 +11,8 @@	3	@@ -11,8 +11,8 @@
4	all:	4	all:
5		5
6	install:	6	install:
7	+ mkdir -p $(EMACSLISPDIR)	7	- cp $(FILES) $(EMACSLISPDIR)
8	cp $(FILES) $(EMACSLISPDIR)
9	- dir=`pwd`; cd $(EMACSLISPDIR); $(EMACS) -batch -l $$dir/compile	8	- dir=`pwd`; cd $(EMACSLISPDIR); $(EMACS) -batch -l $$dir/compile
		9	+ mkdir -p $(EMACSLISPDIR)
		10	+ ${BSD_INSTALL_DATA} $(FILES) $(EMACSLISPDIR)
10		11
11	clean:	12	clean:
12	rm -f ~ ##	13	rm -f ~ ##

Line 0 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-contrib_caml-tex_Makefile (+15 lines)
	1	--- contrib/caml-tex/Makefile.orig Sat Aug 5 10:01:47 2006
	2	+++ contrib/caml-tex/Makefile Sat Aug 5 10:02:30 2006
	3	@@ -7,9 +7,9 @@
	4	all:
	5
	6	install:
	7	- - cp caml-tex $(BINDIR)/caml-tex
	8	- - cp caml.sty caml-sl.sty $(TEXINPUTDIR)
	9	- - cp caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
	10	+ - ${BSD_INSTALL_DATA} caml-tex $(BINDIR)/caml-tex
	11	+ - ${BSD_INSTALL_DATA} caml.sty caml-sl.sty $(TEXINPUTDIR)
	12	+ - ${BSD_INSTALL_MAN} caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
	13
	14	caml-tex.doc: caml-tex.1
	15	nroff -man caml-tex.1 \| sed -e 's/_//g' > caml-tex.doc

Line 0 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-contrib_libnum_bignum_Makefile (+20 lines)
	1	--- contrib/libnum/bignum/Makefile.orig Sat Aug 5 10:03:23 2006
	2	+++ contrib/libnum/bignum/Makefile Sat Aug 5 10:05:03 2006
	3	@@ -4,7 +4,7 @@
	4	# modified_on Thu Nov 2 14:23:14 GMT+1:00 1989 by gangnet
	5	# modified_on Wed Jul 5 10:23:54 GMT+2:00 1989 by bertin
	6
	7	-CC = cc
	8	+#CC = cc
	9	AR = ar
	10	RANLIB = ranlib
	11	RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
	12	@@ -327,7 +327,7 @@
	13	rm -f bignum.00.shar
	14	$(SENDMAIL) $(SENDMAILFLAGS) $(USER) <tosend
	15	for i in `ls bignum.[0-9][0-9].shar`; \
	16	- do cp sendmail_header tosend; \
	17	+ do ${BSD_INSTALL_DATA} sendmail_header tosend; \
	18	echo $$i \| sed -e "s/^bignum0*/Subject: BigNum - Part /" >>tosend; \
	19	echo "# Remove all text above and including this line." >>tosend; \
	20	sed -e "s/modified_on/modified_on/g" <$$i >>tosend; \

Line 0 Link Here

(-)/var/tmp/tmp4/caml-light/files/patch-src_launch_Makefile (+16 lines)
	1	--- src/launch/Makefile.orig Sat Aug 5 10:05:58 2006
	2	+++ src/launch/Makefile Sat Aug 5 10:06:43 2006
	3	@@ -17,11 +17,11 @@
	4	chmod a+x /tmp/testscr
	5	sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
	6	then echo "#!$(BINDIR)/camlrun" > $(LIBDIR)/header; \
	7	- else cp camlexec $(LIBDIR)/header; \
	8	+ else ${BSD_INSTALL_SCRIPT} camlexec $(LIBDIR)/header; \
	9	fi'
	10	rm -f /tmp/testscr
	11	for script in camlc camllight camlmktop; do \
	12	- cp $$script $(BINDIR)/$$script; \
	13	+ ${BSD_INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
	14	chmod a+x $(BINDIR)/$$script; \
	15	done
	16