Attachment 134224 Details for Bug 178869 – lang_scm.diff

[patch] lang_scm.diff

lang_scm.diff (text/x-diff), 9.95 KB, created by tkato432 on 2013-05-25 18:51:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-05-25 18:51:07 UTC

Size: 9.95 KB

patch

obsolete

>diff -urN /usr/ports/lang/scm/Makefile lang/scm/Makefile
>--- /usr/ports/lang/scm/Makefile	2012-11-08 08:24:26.000000000 +0900
>+++ lang/scm/Makefile	2013-05-26 00:00:00.000000000 +0900
>@@ -1,99 +1,97 @@
>-# New ports collection makefile for:	scm
>-# Date created:		Sat Nov  5 17:11:01 PST 1994
>-# Whom:			hsu
>-#
>+# Created by: hsu
> # $FreeBSD: head/lang/scm/Makefile 300896 2012-07-14 13:54:48Z beat $
>-#
> 
> PORTNAME=	scm
>-PORTVERSION=	5e7
>+PORTVERSION=	5f1
> CATEGORIES=	lang scheme
>-MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ \
>-		ftp://ftp.informatik.uni-hamburg.de/ftpmnt/inf1/pub/soft/lang/scheme/
>+MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
> MASTER_SITE_SUBDIR=	. OLD
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip slib-psd1-3.tar.gz
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b3.zip
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip slib-psd1-3.tar.gz
>+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b4.zip
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A scheme interpreter
>+COMMENT=	Scheme interpreter
>+
>+LICENSE=	LGPL21
>+
>+OPTIONS_DEFINE=	X11
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> USE_ZIP=	yes
>+USES=		readline
>+USE_GCC=	any
> USE_GMAKE=	yes
>-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" IMPLPATH="${PREFIX}/lib/scm/" \
>-		SCMLIT="./scmlit"
>-ALL_TARGET=	scmlit scm5 mydlls
>-MAN1=		scm.1
>-INFO=		scm
> MAKE_JOBS_UNSAFE=	yes
> 
>+SUB_FILES=	require.scm
>+
> PLIST_SUB=	VERSION="${PORTVERSION}"
> 
>-SUB_FILES=	require.scm
>+MAN1=		scm.1
>+INFO=		scm
> 
> SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
> 		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
> 		Transcen.scm Tscript.scm build build.scm compile.scm \
>-		hobbit.scm keysymdef.scm mkimpcat.scm patchlvl.h \
>-		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm \
>-		x11.scm xatoms.scm xevent.scm
>+		hobbit.scm mkimpcat.scm patchlvl.h \
>+		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm
> SCM_MODULES=	byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \
> 		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
> 		socket.so unix.so
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MX11}
>+USE_XORG=	ice sm x11 xext
>+PLIST_SUB+=	X11=""
>+SCM_DATA+=	keysymdef.scm x11.scm xatoms.scm xevent.scm
>+SCM_MODULES+=	x.so
>+.else
>+PLIST_SUB+=	X11="@comment "
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
> BROKEN=		Does not compile on ia64, powerpc, or sparc64
> .endif
> 
>-.if defined(WITH_X11)
>-USE_XORG=	ice sm x11 xext
>-SCM_MODULES+=	x.so
>-PLIST_SUB+=	X11=""
>+.if ${OSVERSION} > 1000000
>+READLINE_DIR=	${LOCALBASE}
> .else
>-PLIST_SUB+=	X11="@comment "
>+READLINE_DIR=	/usr
> .endif
> 
> post-extract:
> 	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/slib-psd1-3.tar.gz
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build
>+	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
>+		${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
> 		 s|%%CFLAGS%%|${CFLAGS}|g ; \
>+		 s|%%READLINE_DIR%%|${READLINE_DIR}|g ; \
> 		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
> 	@${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c
>-
>-post-build:
>-	@cd ${WRKSRC} \
>-		&& SCMLIT="./scmlit" ${SH} ./build \
>-		 -c differ.c \
>-		 -h system \
>-		 -t dll
>-.if defined(WITH_X11)
>-	@cd ${WRKSRC} \
>-		&& SCMLIT="./scmlit" ${SH} ./build \
>-		 -F x \
>-		 -h system \
>-		 -t dll
>-.endif
>+	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
>+		${WRKSRC}/xgen.scm
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/scm ${PREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/scmlit ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/scm.1 ${MANPREFIX}/man/man1
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} scm ${PREFIX}/bin)
>+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} scmlit ${PREFIX}/bin)
>+	(cd ${WRKSRC} && ${INSTALL_MAN} scm.1 ${MANPREFIX}/man/man1)
> 	@${MKDIR} ${PREFIX}/lib/scm
>-	${INSTALL_DATA} ${WRKDIR}/require.scm ${PREFIX}/lib/scm
>-.for file in ${SCM_DATA} ${SCM_MODULES}
>-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/scm
>+	(cd ${WRKDIR} && ${INSTALL_DATA} require.scm ${PREFIX}/lib/scm)
>+.for i in ${SCM_DATA} ${SCM_MODULES}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${PREFIX}/lib/scm)
> .endfor
> 	@${MKDIR} ${PREFIX}/lib/scm/slib
>-	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${PREFIX}/lib/scm/slib
>+	(cd ${WRKDIR}/slib && ${INSTALL_DATA} *.scm ${PREFIX}/lib/scm/slib)
> 	@${MKDIR} ${PREFIX}/lib/scm/slib/psd
>-	${INSTALL_DATA} ${WRKDIR}/slib/psd/*.scm ${PREFIX}/lib/scm/slib/psd
>-	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${PREFIX}/${INFO_PATH}
>-	cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm
>+	(cd ${WRKDIR}/slib/psd && ${INSTALL_DATA} *.scm \
>+		${PREFIX}/lib/scm/slib/psd)
>+	(cd ${WRKDIR}/scm && ${INSTALL_DATA} scm.info ${PREFIX}/${INFO_PATH})
>+	(cd ${PREFIX}/lib/scm && ${PREFIX}/bin/scm -lmkimpcat.scm)
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/lang/scm/distinfo lang/scm/distinfo
>--- /usr/ports/lang/scm/distinfo	2012-11-08 08:24:26.000000000 +0900
>+++ lang/scm/distinfo	2013-05-26 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>-SHA256 (scm-5e7.zip) = f4869c7925574c8a167249adb0bc0e4bbd0415cd1e3d02c8daf98fbe0d710f51
>-SIZE (scm-5e7.zip) = 919897
>-SHA256 (slib-3b3.zip) = 1861aad6e80b2afaf14789a8778c1f0c00ff8fd6051f7cffcd2aa945880b443e
>-SIZE (slib-3b3.zip) = 1085062
>+SHA256 (scm-5f1.zip) = f469e08e03fef5e2fa54349faaff630e63e88fc39f5fc98a6a55a6aa865a57c0
>+SIZE (scm-5f1.zip) = 952965
>+SHA256 (slib-3b4.zip) = ddfa66c61db1dec44147cad98e46cb9ec151f62dfaa10aa2508fbd26d46272a7
>+SIZE (slib-3b4.zip) = 1099910
> SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
> SIZE (slib-psd1-3.tar.gz) = 62397
>diff -urN /usr/ports/lang/scm/files/patch-build.scm lang/scm/files/patch-build.scm
>--- /usr/ports/lang/scm/files/patch-build.scm	2012-11-08 08:24:26.000000000 +0900
>+++ lang/scm/files/patch-build.scm	2013-05-26 00:00:00.000000000 +0900
>@@ -1,14 +1,24 @@
> --- build.scm.orig	2009-08-04 03:35:57.000000000 +0900
> +++ build.scm	2009-08-07 01:59:30.000000000 +0900
>-@@ -659,6 +659,7 @@
>-      (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
>+@@ -667,12 +667,13 @@
>+ 
>+      (c freebsd "" "-export-dynamic" #f () ())
>+      (m freebsd "" "-lm" #f () ())
>+-     (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ())
>++     (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
>       (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ())
>-      (editline freebsd "" "-lreadline" "" () ())
>-+     (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-L%%LOCALBASE%%/lib -lX 11" "%%LOCALBASE%%/lib/libX11.so" () ())
>+-     (editline freebsd "" "-lreadline" "" () ())
>++     (editline freebsd "-I%%READLINE_DIR%%/include" "-lreadline" "-L%%READLINE_DIR%%/lib" () ())
>++     (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-lX11" "-L%%LOCALBASE%%/lib" () ())
>       (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
>-      (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
>-      (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
>-@@ -1619,7 +1620,7 @@
>+-     (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
>+-     (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
>++     (nostart freebsd "" "" #f () ())
>++     (dump freebsd "" "" #f ("unexeclf.c" "gmalloc.c") ())
>+      (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
>+      (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
>+      (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
>+@@ -1630,7 +1631,7 @@
>  	  parms
>  ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
>  	  ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
>@@ -17,7 +27,7 @@
>  	  (include-spec "-I" parms)
>  	  (c-includes parms)
>  	  (c-flags parms)
>-@@ -1630,7 +1631,7 @@
>+@@ -1641,7 +1642,7 @@
>      (batch:rename-file parms
>  		       oname (string-append oname "~"))
>      (and (batch:try-command parms
>@@ -26,7 +36,7 @@
>  			    (must-be-first
>  			     '("-nostartfiles"
>  			       "pre-crt0.o" "crt0.o"
>-@@ -1640,17 +1641,18 @@
>+@@ -1651,17 +1652,18 @@
>  (defcommand compile-dll-c-files freebsd
>    (lambda (files parms)
>      (and (batch:try-chopped-command
>@@ -41,14 +51,15 @@
> -		 parms "cc" "-shared"
> +		 parms "%%CC%%" "-shared"
>  		 (cond
>- 		  ((equal? (car fnames) "edline") "-lreadline")
>+-		  ((equal? (car fnames) "edline") "-lreadline")
> -		  ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
>++		  ((equal? (car fnames) "edline") "-L%%READLINE_DIR%%/lib -lreadline")
> +		  ((equal? (car fnames) "rgx") "-lgnuregex")
> +		  ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11")
>  		  (else ""))
>  		 "-o" (string-append (car fnames) ".so")
>  		 (map (lambda (fname) (string-append fname ".o")) fnames))
>-@@ -1663,7 +1665,7 @@
>+@@ -1674,7 +1676,7 @@
>    (lambda (oname objects libs parms)
>      (and (batch:try-command
>  	  parms
>diff -urN /usr/ports/lang/scm/pkg-plist lang/scm/pkg-plist
>--- /usr/ports/lang/scm/pkg-plist	2012-11-08 08:24:27.000000000 +0900
>+++ lang/scm/pkg-plist	2013-05-26 00:00:00.000000000 +0900
>@@ -22,7 +22,7 @@
> lib/scm/hobbit.scm
> lib/scm/implcat
> lib/scm/ioext.so
>-lib/scm/keysymdef.scm
>+%%X11%%lib/scm/keysymdef.scm
> lib/scm/mkimpcat.scm
> lib/scm/patchlvl.h
> lib/scm/posix.so
>@@ -78,6 +78,7 @@
> lib/scm/slib/dynwind.scm
> lib/scm/slib/eval.scm
> lib/scm/slib/factor.scm
>+lib/scm/slib/fluid-let.scm
> lib/scm/slib/fluidlet.scm
> lib/scm/slib/format.scm
> lib/scm/slib/formatst.scm
>@@ -195,7 +196,7 @@
> lib/scm/slib/values.scm
> lib/scm/slib/vet.scm
> lib/scm/slib/withfile.scm
>-lib/scm/slib/wttest.scm
>+lib/scm/slib/wttree-test.scm
> lib/scm/slib/wttree.scm
> lib/scm/slib/xml-parse.scm
> lib/scm/slib/yasyn.scm
>@@ -204,9 +205,9 @@
> lib/scm/unix.so
> lib/scm/wbtab.scm
> %%X11%%lib/scm/x.so
>-lib/scm/x11.scm
>-lib/scm/xatoms.scm
>-lib/scm/xevent.scm
>+%%X11%%lib/scm/x11.scm
>+%%X11%%lib/scm/xatoms.scm
>+%%X11%%lib/scm/xevent.scm
> @dirrm lib/scm/slib/psd
> @dirrm lib/scm/slib
> @dirrm lib/scm

Actions: View | Diff

Attachments on bug 178869: 134223 | 134224