Attachment 68889 Details for Bug 101148 – ocaml-classes-3.05_1.patch

[patch] ocaml-classes-3.05_1.patch

ocaml-classes-3.05_1.patch (text/plain), 3.32 KB, created by Stanislav Sedov on 2006-08-01 10:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Sedov

Created: 2006-08-01 10:00:31 UTC

Size: 3.32 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/ocaml-classes/Makefile /var/tmp/ocaml-classes/Makefile
>--- /usr/ports/devel/ocaml-classes/Makefile	Thu Apr 14 12:19:19 2005
>+++ /var/tmp/ocaml-classes/Makefile	Tue Aug  1 12:55:14 2006
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	classes
> PORTVERSION=	3.05
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/\
> 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/\
>@@ -14,10 +15,11 @@
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	ocaml-${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ssedov@mbsd.msk.ru
> COMMENT=	Ocaml Object interface for ocaml's standard library modules
> 
> BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
>+RUN_DEPENDS=	${BUILD_DEPENDS}
> 
> post-extract:
> 	@${CP} ${FILESDIR}/META ${WRKSRC}
>diff -ruN --exclude=CVS /usr/ports/devel/ocaml-classes/files/patch-Makefile /var/tmp/ocaml-classes/files/patch-Makefile
>--- /usr/ports/devel/ocaml-classes/files/patch-Makefile	Fri Sep 20 17:21:30 2002
>+++ /var/tmp/ocaml-classes/files/patch-Makefile	Tue Aug  1 12:53:15 2006
>@@ -1,9 +1,10 @@
>---- Makefile.orig	Thu Apr 18 20:39:26 2002
>-+++ Makefile	Fri Sep 20 21:16:25 2002
>-@@ -1,10 +1,11 @@
>+--- Makefile.orig	Thu Apr 18 16:39:26 2002
>++++ Makefile	Tue Aug  1 12:53:14 2006
>+@@ -1,10 +1,12 @@
>  #Adjust this directory for installation
> -LIBDIR=`ocamlc -where`
>-+LIBDIR=$(PREFIX)/lib/ocaml/site-lib/classes
>++LIBDIR=$(LOCALBASE)/lib/ocaml/site-lib/classes
>++DISTDIR=$(PREFIX)/lib/ocaml/site-lib/classes
>  COMPILER=ocamlc -c
>  LIBRARIAN=ocamlc -a
>  OPTCOMP=ocamlopt -c
>@@ -14,16 +15,35 @@
>  
>  OBJECTS=obuffer.cmo	ohashtbl.cmo	oqueue.cmo	ostack.cmo \
>  	omap.cmo	oset.cmo	ostream.cmo	omapping.cmo
>-@@ -43,12 +44,15 @@
>+@@ -16,13 +18,13 @@
>+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
>+ 
>+ .ml.cmo:
>+-	$(COMPILER) $(INCLUDES) $<
>++	$(COMPILER) -ccopt "${CFLAGS}" $(INCLUDES) $<
>+ 
>+ .ml.cmx:
>+-	$(OPTCOMP) $(INCLUDES) $<
>++	$(OPTCOMP) -ccopt "${CFLAGS}" $(INCLUDES) $<
>+ 
>+ .mli.cmi:
>+-	$(COMPILER) $(INCLUDES) $<
>++	$(COMPILER) -ccopt "${CFLAGS}" $(INCLUDES) $<
>+ 
>+ all: stdclass.cma
>+ opt: stdclass.cmxa
>+@@ -43,12 +45,15 @@
>  	@$(MAKE) real-install LIBDIR=$(LIBDIR)
>  
>  real-install:
>-+	$(INSTALLDIR) $(LIBDIR)
>- 	$(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR)
>+-	$(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR)
>++	$(INSTALLDIR) $(DISTDIR)
>++	$(INSTALL) stdclass.cma *.cmi *.mli $(DISTDIR)
>  	if test -f stdclass.cmxa; \
>- 	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi
>+-	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi
>++	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DISTDIR); fi
> +	if test -f META; \
>-+	then $(INSTALL) META $(LIBDIR); fi
>++	then $(INSTALL) META $(DISTDIR); fi
>  
>  clean:
> -	rm -f *.cm* *.o *.a *~ #*
>diff -ruN --exclude=CVS /usr/ports/devel/ocaml-classes/pkg-plist /var/tmp/ocaml-classes/pkg-plist
>--- /usr/ports/devel/ocaml-classes/pkg-plist	Thu Apr 14 12:19:19 2005
>+++ /var/tmp/ocaml-classes/pkg-plist	Tue Aug  1 12:54:02 2006
>@@ -1,3 +1,4 @@
>+lib/ocaml/site-lib/classes/META
> lib/ocaml/site-lib/classes/obuffer.cmi
> lib/ocaml/site-lib/classes/obuffer.mli
> lib/ocaml/site-lib/classes/ogenlex.mli
>@@ -16,6 +17,5 @@
> lib/ocaml/site-lib/classes/ostream.cmi
> lib/ocaml/site-lib/classes/ostream.mli
> lib/ocaml/site-lib/classes/stdclass.cma
>-lib/ocaml/site-lib/classes/META
> @dirrm lib/ocaml/site-lib/classes
>-@dirrm lib/ocaml/site-lib
>+@dirrmtry lib/ocaml/site-lib

Actions: View | Diff

Attachments on bug 101148: 68889