Date: Sat, 5 Aug 2006 10:23:14 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jkoshy@FreeBSD.org Subject: ports/101398: [PATCH] lang/caml-light: CFLAGS, CC, permissions safety Message-ID: <20060805062314.546DC120B1@fonon.realnet> Resent-Message-ID: <200608050700.k7570VKW012882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101398 >Category: ports >Synopsis: [PATCH] lang/caml-light: CFLAGS, CC, permissions safety >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: Sat Aug 05 07:00:30 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD >Description: - caml-light doesn't honor CC, CFLAGS, permissions. Fix that. The following files was added: - files/patch-contrib_caml-tex_Makefile - files/patch-contrib_libnum_bignum_Makefile - files/patch-src_launch_Makefile - files/patch-src_runtime_Makefile Copy of this message was sent to (jkoshy@freebsd.org). >How-To-Repeat: >Fix: --- caml-0.75_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/lang/caml-light/Makefile /var/tmp/tmp4/caml-light/Makefile --- /usr/ports/lang/caml-light/Makefile Sat Mar 6 17:54:05 2004 +++ /var/tmp/tmp4/caml-light/Makefile Sat Aug 5 10:22:02 2006 @@ -7,6 +7,7 @@ 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/ \ @@ -21,7 +22,8 @@ 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 +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> @@ -31,9 +33,9 @@ # build some contrib stuff too do-install: - cd ${WRKSRC}/src; ${MAKE} ${INSTALL_TARGET} PREFIX=${PREFIX} \ - X11BASE=${X11BASE} - cd ${WRKSRC}/contrib; ${MAKE} all ${INSTALL_TARGET} PREFIX=${PREFIX} \ - X11BASE=${X11BASE} + 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> diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-aa /var/tmp/tmp4/caml-light/files/patch-aa --- /usr/ports/lang/caml-light/files/patch-aa Sat Mar 6 17:54:05 2004 +++ /var/tmp/tmp4/caml-light/files/patch-aa Sat Aug 5 09:56:49 2006 @@ -1,11 +1,28 @@ ---- src/Makefile.orig Wed Mar 3 18:55:57 1999 -+++ src/Makefile Sat Mar 6 19:51:31 2004 +--- 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 ++CPP=/usr/bin/cpp -P -traditional -Dunix ${CPPFLAGS} # The directory where public executables will be installed -BINDIR=/usr/local/bin diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-ab /var/tmp/tmp4/caml-light/files/patch-ab --- /usr/ports/lang/caml-light/files/patch-ab Sat Mar 6 17:54:05 2004 +++ /var/tmp/tmp4/caml-light/files/patch-ab Sat Aug 5 09:58:17 2006 @@ -1,6 +1,6 @@ ---- contrib/Makefile.orig Sat Nov 11 15:57:42 2000 -+++ contrib/Makefile Sat Mar 6 06:42:32 2004 -@@ -5,7 +5,7 @@ +--- 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 \ @@ -9,7 +9,18 @@ # caml-tex # caml-latex2e # camltk -@@ -22,7 +22,7 @@ + + # 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. diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-ad /var/tmp/tmp4/caml-light/files/patch-ad --- /usr/ports/lang/caml-light/files/patch-ad Tue Jul 28 10:25:42 1998 +++ /var/tmp/tmp4/caml-light/files/patch-ad Sat Aug 5 09:59:30 2006 @@ -1,8 +1,9 @@ ---- src/man/Makefile-- Tue Nov 1 23:06:06 1994 -+++ src/man/Makefile Tue Jul 28 08:50:22 1998 +--- src/man/Makefile.orig Tue Nov 1 20:36:06 1994 ++++ src/man/Makefile Sat Aug 5 09:59:15 2006 @@ -3,4 +3,5 @@ MANDIR=/usr/man/man$(MANEXT) install: +- for f in $(MAN); do cp $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done + mkdir -p ${MANDIR} - for f in $(MAN); do cp $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done ++ for f in $(MAN); do ${BSD_INSTALL_MAN} $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-ae /var/tmp/tmp4/caml-light/files/patch-ae --- /usr/ports/lang/caml-light/files/patch-ae Thu Aug 20 12:07:13 1998 +++ /var/tmp/tmp4/caml-light/files/patch-ae Sat Aug 5 10:00:24 2006 @@ -1,12 +1,13 @@ ---- contrib/camlmode/Makefile.orig Mon Dec 2 22:13:37 1996 -+++ contrib/camlmode/Makefile Thu Aug 20 08:11:56 1998 +--- 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: -+ mkdir -p $(EMACSLISPDIR) - 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 *~ #*# diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-af /var/tmp/tmp4/caml-light/files/patch-af --- /usr/ports/lang/caml-light/files/patch-af Tue Jul 28 10:25:42 1998 +++ /var/tmp/tmp4/caml-light/files/patch-af Sat Aug 5 10:01:09 2006 @@ -1,7 +1,8 @@ ---- contrib/camlsearch/emacs-lisp/Makefile-- Sat Feb 4 23:42:23 1995 -+++ contrib/camlsearch/emacs-lisp/Makefile Tue Jul 28 08:49:53 1998 +--- contrib/camlsearch/emacs-lisp/Makefile.orig Sat Feb 4 21:12:23 1995 ++++ contrib/camlsearch/emacs-lisp/Makefile Sat Aug 5 10:00:54 2006 @@ -1,3 +1,4 @@ SOURCES=caml-search.el install: $(SOURCES) +- cp $(SOURCES) $(ELISPDIR) + mkdir -p $(ELISPDIR) - cp $(SOURCES) $(ELISPDIR) ++ ${BSD_INSTALL_DATA} $(SOURCES) $(ELISPDIR) diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-contrib_caml-tex_Makefile /var/tmp/tmp4/caml-light/files/patch-contrib_caml-tex_Makefile --- /usr/ports/lang/caml-light/files/patch-contrib_caml-tex_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/tmp4/caml-light/files/patch-contrib_caml-tex_Makefile Sat Aug 5 10:02:53 2006 @@ -0,0 +1,15 @@ +--- 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 diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-contrib_libnum_bignum_Makefile /var/tmp/tmp4/caml-light/files/patch-contrib_libnum_bignum_Makefile --- /usr/ports/lang/caml-light/files/patch-contrib_libnum_bignum_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/tmp4/caml-light/files/patch-contrib_libnum_bignum_Makefile Sat Aug 5 10:05:34 2006 @@ -0,0 +1,20 @@ +--- 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; \ diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-src_launch_Makefile /var/tmp/tmp4/caml-light/files/patch-src_launch_Makefile --- /usr/ports/lang/caml-light/files/patch-src_launch_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/tmp4/caml-light/files/patch-src_launch_Makefile Sat Aug 5 10:07:21 2006 @@ -0,0 +1,16 @@ +--- 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 + diff -ruN --exclude=CVS /usr/ports/lang/caml-light/files/patch-src_runtime_Makefile /var/tmp/tmp4/caml-light/files/patch-src_runtime_Makefile --- /usr/ports/lang/caml-light/files/patch-src_runtime_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/tmp4/caml-light/files/patch-src_runtime_Makefile Sat Aug 5 10:17:32 2006 @@ -0,0 +1,11 @@ +--- src/runtime/Makefile.orig Sat Aug 5 10:17:26 2006 ++++ src/runtime/Makefile Sat Aug 5 10:17:30 2006 +@@ -3,7 +3,7 @@ + # These options are overriden when called from ../Makefile. + CC=cc + OPTS=#-fno-defer-pop +-CFLAGS=-O2 $(OPTS) -I.. ++CFLAGS=$(OPTS) -I.. + LIBS= + + # Test to see whether ranlib exists on the machine --- caml-0.75_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060805062314.546DC120B1>