Attachment 141533 Details for Bug 188354 – file.diff

[patch] file.diff

file.diff (text/plain), 3.70 KB, created by tkato432 on 2014-04-07 19:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-04-07 19:40:00 UTC

Size: 3.70 KB

patch

obsolete

>diff -urN /usr/ports/devel/ocaml-classes/Makefile devel/ocaml-classes/Makefile
>--- /usr/ports/devel/ocaml-classes/Makefile	2014-01-23 03:44:25.000000000 +0900
>+++ devel/ocaml-classes/Makefile	2014-04-08 00:00:00.000000000 +0900
>@@ -2,22 +2,20 @@
> # $FreeBSD: head/devel/ocaml-classes/Makefile 340722 2014-01-22 17:00:46Z mat $
> 
> PORTNAME=	classes
>-PORTVERSION=	3.05
>-PORTREVISION=	3
>+PORTVERSION=	4.00
> CATEGORIES=	devel
>-MASTER_SITES=	http://caml.inria.fr/pub/distrib/bazar-ocaml/ \
>-		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
>+MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	ocaml-${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Ocaml Object interface for ocaml's standard library modules
> 
>+LICENSE=	LGPL21
>+
> BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-NO_STAGE=	yes
>-post-extract:
>-	@${CP} ${FILESDIR}/META ${WRKSRC}
>+MAKE_ENV=	INSTALL="${INSTALL_DATA}"
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/ocaml-classes/distinfo devel/ocaml-classes/distinfo
>--- /usr/ports/devel/ocaml-classes/distinfo	2014-01-23 03:44:25.000000000 +0900
>+++ devel/ocaml-classes/distinfo	2014-04-08 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ocaml-classes-3.05.tar.gz) = 103cbb4113c673a383b9ec33d3aecf5383808dfddfec60901ec84c6e77902ab7
>-SIZE (ocaml-classes-3.05.tar.gz) = 10205
>+SHA256 (ocaml-classes-4.00.tar.gz) = e62d37e11e608f9340d5477dae68b110b475242d7ea2fdb8c0330ad76f95b5f0
>+SIZE (ocaml-classes-4.00.tar.gz) = 20269
>diff -urN /usr/ports/devel/ocaml-classes/files/META devel/ocaml-classes/files/META
>--- /usr/ports/devel/ocaml-classes/files/META	2014-01-24 16:12:11.000000000 +0900
>+++ devel/ocaml-classes/files/META	1970-01-01 09:00:00.000000000 +0900
>@@ -1,6 +0,0 @@
>-name="classes"
>-version="3.05"
>-description="Object interface for standard library modules"
>-requires=""
>-archive(byte)="stdclass.cma"
>-archive(native)="stdclass.cmxa"
>diff -urN /usr/ports/devel/ocaml-classes/files/patch-Makefile devel/ocaml-classes/files/patch-Makefile
>--- /usr/ports/devel/ocaml-classes/files/patch-Makefile	2014-01-23 03:44:25.000000000 +0900
>+++ devel/ocaml-classes/files/patch-Makefile	2014-04-08 00:00:00.000000000 +0900
>@@ -1,21 +1,19 @@
> --- Makefile.orig	Thu Apr 18 16:39:26 2002
> +++ Makefile	Tue Aug  1 12:53:14 2006
>-@@ -1,10 +1,12 @@
>+@@ -1,10 +1,10 @@
>  #Adjust this directory for installation
> -LIBDIR=`ocamlc -where`
>-+LIBDIR=$(LOCALBASE)/lib/ocaml/site-lib/classes
>-+DISTDIR=$(PREFIX)/lib/ocaml/site-lib/classes
>++LIBDIR=$(PREFIX)/lib/ocaml/site-lib/classes
>  COMPILER=ocamlc -c
>  LIBRARIAN=ocamlc -a
>  OPTCOMP=ocamlopt -c
>  OPTLIB=ocamlopt -a
> -INSTALL=cp
>-+INSTALL=install -o root -g wheel -m 644
>-+INSTALLDIR=install -d -o root -g wheel -m 755
>++INSTALL?=install -o root -g wheel -m 644
>  
>  OBJECTS=obuffer.cmo	ohashtbl.cmo	oqueue.cmo	ostack.cmo \
>  	omap.cmo	oset.cmo	ostream.cmo	omapping.cmo
>-@@ -16,13 +18,13 @@
>+@@ -16,13 +16,13 @@
>  .SUFFIXES: .ml .mli .cmo .cmi .cmx
>  
>  .ml.cmo:
>@@ -32,18 +30,18 @@
>  
>  all: stdclass.cma
>  opt: stdclass.cmxa
>-@@ -43,12 +45,15 @@
>+@@ -43,12 +43,15 @@
>  	@$(MAKE) real-install LIBDIR=$(LIBDIR)
>  
>  real-install:
> -	$(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR)
>-+	$(INSTALLDIR) $(DISTDIR)
>-+	$(INSTALL) stdclass.cma *.cmi *.mli $(DISTDIR)
>++	mkdir -p $(DESTDIR)$(LIBDIR)
>++	$(INSTALL) stdclass.cma *.cmi *.mli $(DESTDIR)$(LIBDIR)
>  	if test -f stdclass.cmxa; \
> -	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi
>-+	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DISTDIR); fi
>++	then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DESTDIR)$(LIBDIR); fi
> +	if test -f META; \
>-+	then $(INSTALL) META $(DISTDIR); fi
>++	then $(INSTALL) META $(DESTDIR)$(LIBDIR); fi
>  
>  clean:
> -	rm -f *.cm* *.o *.a *~ #*

Actions: View | Diff

Attachments on bug 188354: 141533