From owner-svn-ports-all@FreeBSD.ORG Sun Jun 1 14:02:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31CE86A0; Sun, 1 Jun 2014 14:02:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12E162F84; Sun, 1 Jun 2014 14:02:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51E2GRh084761; Sun, 1 Jun 2014 14:02:16 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51E2GbK084755; Sun, 1 Jun 2014 14:02:16 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406011402.s51E2GbK084755@svn.freebsd.org> From: Pawel Pekala Date: Sun, 1 Jun 2014 14:02:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356122 - in head/lang/siod: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 14:02:17 -0000 Author: pawel Date: Sun Jun 1 14:02:15 2014 New Revision: 356122 URL: http://svnweb.freebsd.org/changeset/ports/356122 QAT: https://qat.redports.org/buildarchive/r356122/ Log: - Add staging support, strip binaries - Remove leading article from COMMENT - Use canonical names for patches Added: head/lang/siod/files/patch-makefile - copied, changed from r355850, head/lang/siod/files/patch-aa head/lang/siod/files/patch-regex.c - copied unchanged from r355850, head/lang/siod/files/patch-ab head/lang/siod/files/patch-slibu.c - copied unchanged from r355850, head/lang/siod/files/patch-ac Deleted: head/lang/siod/files/patch-aa head/lang/siod/files/patch-ab head/lang/siod/files/patch-ac Modified: head/lang/siod/Makefile head/lang/siod/pkg-plist Modified: head/lang/siod/Makefile ============================================================================== --- head/lang/siod/Makefile Sun Jun 1 13:54:07 2014 (r356121) +++ head/lang/siod/Makefile Sun Jun 1 14:02:15 2014 (r356122) @@ -10,7 +10,7 @@ DISTNAME= siod EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A small footprint implementation of the Scheme programming language +COMMENT= Small footprint implementation of the Scheme programming language USE_LDCONFIG= yes @@ -20,9 +20,7 @@ ALL_TARGET= freebsd MAKE_ENV= LD_LIBRARY_PATH=. MAKE_JOBS_UNSAFE= yes -MAN1= siod.1 snapshot-dir.1 snapshot-compare.1 http-get.1 \ - cp-build.1 ftp-cp.1 csiod.1 ftp-put.1 ftp-test.1 ftp-get.1 \ - http-stress.1 proxy-server.1 +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/siod -NO_STAGE= yes .include Copied and modified: head/lang/siod/files/patch-makefile (from r355850, head/lang/siod/files/patch-aa) ============================================================================== --- head/lang/siod/files/patch-aa Fri May 30 14:25:51 2014 (r355850, copy source) +++ head/lang/siod/files/patch-makefile Sun Jun 1 14:02:15 2014 (r356122) @@ -1,5 +1,5 @@ ---- makefile-- Fri Feb 20 18:22:04 1998 -+++ makefile Wed Apr 28 13:02:03 1999 +--- makefile.orig 2000-03-14 16:26:55.000000000 +0100 ++++ makefile 2014-06-01 15:48:40.620294169 +0200 @@ -19,10 +19,10 @@ # # @@ -15,11 +15,10 @@ LIBSIODDIR=$(LIBDIR)/siod CP_F=cp -f # -Wmissing-prototypes -@@ -270,6 +270,19 @@ - CFLAGS="$(CDEBUG)" \ +@@ -300,6 +300,19 @@ LD_EXE_LIBS="-lm -ldl" \ build_driver -+ + +## FreeBSD, possibly other BSDs +freebsd: + $(MAKE) \ @@ -32,6 +31,49 @@ + SO="so" \ + build_driver + - ++ unknown: -ln -s ssiod siod + $(MAKE) \ +@@ -457,30 +470,30 @@ + install: $(DISTFILES) + @echo "Note: This does not do a build. Only installs what already" + @echo " sits in the directory." +- -mkdir -p $(MANDIR) +- -mkdir -p $(BINDIR) +- -mkdir -p $(LIBDIR) +- -mkdir -p $(INCDIR) +- -mkdir -p $(LIBSIODDIR) ++ -mkdir -p $(DESTDIR)$(MANDIR) ++ -mkdir -p $(DESTDIR)$(BINDIR) ++ -mkdir -p $(DESTDIR)$(LIBDIR) ++ -mkdir -p $(DESTDIR)$(INCDIR) ++ -mkdir -p $(DESTDIR)$(LIBSIODDIR) + -for X in $(INTO_BINDIR) ; do \ +- $(CP_F) $$X $(BINDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(BINDIR) ;\ + done + -for X in $(LIBFILES) ; do \ +- $(CP_F) $$X $(LIBSIODDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(LIBSIODDIR) ;\ + done + -for X in $(SOLIBFILES) ; do \ + for E in so sl ; do \ +- $(CP_F) $$X.$$E $(LIBSIODDIR) ;\ ++ $(BSD_INSTALL_LIB) $$X.$$E $(DESTDIR)$(LIBSIODDIR) ;\ + done ;\ + done + -for X in $(INTO_LIBDIR) ; do \ +- $(CP_F) $$X $(LIBDIR) ;\ ++ $(BSD_INSTALL_LIB) $$X $(DESTDIR)$(LIBDIR) ;\ + done + -for X in $(MANPAGES) ; do \ +- $(CP_F) $$X.man $(MANDIR)/$$X.$(MANSEC) ;\ ++ $(CP_F) $$X.man $(DESTDIR)$(MANDIR)/$$X.$(MANSEC) ;\ + done + -for X in $(PUBINCS) ; do \ +- $(CP_F) $$X $(INCDIR) ;\ ++ $(CP_F) $$X $(DESTDIR)$(INCDIR) ;\ + done + @echo "Install done." + Copied: head/lang/siod/files/patch-regex.c (from r355850, head/lang/siod/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/siod/files/patch-regex.c Sun Jun 1 14:02:15 2014 (r356122, copy of r355850, head/lang/siod/files/patch-ab) @@ -0,0 +1,21 @@ +--- regex.c-- Mon Dec 1 23:48:17 1997 ++++ regex.c Wed Apr 28 12:59:44 1999 +@@ -4,6 +4,9 @@ + author: george j. carrette + */ + ++#if defined(HAVE_SYS_PARAM_H) ++#include ++#endif + + #include + #include +@@ -11,7 +14,7 @@ + #if defined(VMS) + #include + #endif +-#if defined(sgi) ++#if defined(sgi) || defined(BSD) + #include + #endif + #include Copied: head/lang/siod/files/patch-slibu.c (from r355850, head/lang/siod/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/siod/files/patch-slibu.c Sun Jun 1 14:02:15 2014 (r356122, copy of r355850, head/lang/siod/files/patch-ac) @@ -0,0 +1,101 @@ +--- slibu.c.orig Mon Dec 1 19:16:38 1997 ++++ slibu.c Thu Jan 6 15:04:04 2000 +@@ -20,6 +20,10 @@ + #include + #include + ++#if defined(HAVE_SYS_PARAM_H) ++#include ++#endif ++ + #if defined(unix) + #include + #include +@@ -50,7 +54,7 @@ + #include + #endif + +-#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) ++#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) || defined(BSD) + #include + #endif + +@@ -288,6 +292,7 @@ + return(NIL);} + #endif + ++#if !defined(BSD) + LISP lputpwent(LISP alist,LISP file) + {int iflag = no_interrupt(1); + int status; +@@ -296,6 +301,7 @@ + status = putpwent(&p,get_c_file(file,NULL)); + no_interrupt(iflag); + return(NIL);} ++#endif + + LISP laccess_problem(LISP lfname,LISP lacc) + {char *fname = get_c_string(lfname); +@@ -1021,7 +1027,7 @@ + + #if defined(unix) || defined(WIN32) + +-LISP lchmod(LISP path,LISP mode) ++LISP l_chmod(LISP path,LISP mode) + {if (chmod(get_c_string(path),get_c_long(mode))) + return(err("chmod",llast_c_errmsg(-1))); + else +@@ -1029,6 +1035,15 @@ + + #endif + ++#if defined(unix) || defined(WIN32) ++ ++LISP l_lchmod(LISP path,LISP mode) ++{if (lchmod(get_c_string(path),get_c_long(mode))) ++ return(err("lchmod",llast_c_errmsg(-1))); ++ else ++ return(NIL);} ++ ++#endif + + #ifdef unix + +@@ -1554,7 +1569,7 @@ + /* note: error cases can leak memory in this procedure. */ + {LISP init_name; + void (*fcn)(void) = NULL; +-#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) ++#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) || defined(BSD) + void *handle; + #endif + #if defined(hpux) +@@ -1575,7 +1590,7 @@ + {put_st("so-loading "); + put_st(get_c_string(fname)); + put_st("\n");} +-#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) ++#if defined(__osf__) || defined(sun) || defined(linux) || defined(sgi) || defined(BSD) + #if !defined(__osf__) + /* Observed bug: values of LD_LIBRARY_PATH established with putenv + -after- a process has started are ignored. Work around follows. */ +@@ -2163,7 +2178,8 @@ + opendir_gc_free, + &j); + set_print_hooks(tc_opendir,opendir_prin1); +- init_subr_2("chmod",lchmod); ++ init_subr_2("chmod",l_chmod); ++ init_subr_2("lchmod",l_lchmod); + #endif + + gc_protect_sym(&sym_channels,"*channels*"); +@@ -2197,7 +2213,9 @@ + #if defined(__osf__) + init_subr_1("setpwfile",lsetpwfile); + #endif ++#if !defined(BSD) + init_subr_2("putpwent",lputpwent); ++#endif + init_subr_2("access-problem?",laccess_problem); + init_subr_3("utime",lutime); + init_subr_2("fchmod",lfchmod); Modified: head/lang/siod/pkg-plist ============================================================================== --- head/lang/siod/pkg-plist Sun Jun 1 13:54:07 2014 (r356121) +++ head/lang/siod/pkg-plist Sun Jun 1 14:02:15 2014 (r356122) @@ -39,4 +39,16 @@ lib/siod/regex.so lib/siod/parser_pratt.so lib/libsiod.so include/siod.h +man/man1/cp-build.1.gz +man/man1/csiod.1.gz +man/man1/ftp-cp.1.gz +man/man1/ftp-get.1.gz +man/man1/ftp-put.1.gz +man/man1/ftp-test.1.gz +man/man1/http-get.1.gz +man/man1/http-stress.1.gz +man/man1/proxy-server.1.gz +man/man1/siod.1.gz +man/man1/snapshot-compare.1.gz +man/man1/snapshot-dir.1.gz @dirrm lib/siod