Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Sep 2000 15:51:39 -0500 (CDT)
From:      sluggo@unknown.nu
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/21485: Update: devel/camlp4
Message-ID:  <200009222051.PAA96883@jinx.unknown.nu>

next in thread | raw e-mail | index | archive | help

>Number:         21485
>Category:       ports
>Synopsis:       Update: devel/camlp4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 22 14:00:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Kim Scarborough
>Release:        FreeBSD 3.5-RELEASE i386
>Organization:
Quality Quackeries
>Environment:

	N/A

>Description:

	An update to the camlp4 port to version 3.00. A new file has been
	added: patches/patch-ab. Please commit this as soon as possible,
	as the port has been broken since the upgrade of lang/ocaml.

	I am the maintainer of this port.

>How-To-Repeat:

	N/A

>Fix:
	
diff -ruN camlp4.orig/Makefile camlp4/Makefile
--- camlp4.orig/Makefile	Fri Sep 22 05:50:50 2000
+++ camlp4/Makefile	Fri Sep 22 15:33:55 2000
@@ -4,20 +4,15 @@
 #
 # $FreeBSD: ports/devel/camlp4/Makefile,v 1.3 2000/09/22 10:23:24 kris Exp $
 #
-# This is not the current version, but the version needs to
-# be <= the version of ocaml, which hasn't been updated. Once
-# the ocaml maintainer updates it, I'll update this.
 
 PORTNAME=	camlp4
-PORTVERSION=	2.04
+PORTVERSION=	3.00
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/OLD/2.04/ \
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/ \
 		http://www.unknown.nu/ports/
 
 MAINTAINER=	user@unknown.nu
 
-BROKEN=		"Does not compile"
-
 BUILD_DEPENDS=	ocamlc.opt:${PORTSDIR}/lang/ocaml
 
 HAS_CONFIGURE=	yes
@@ -27,8 +22,8 @@
 ALL_TARGET=	world bootstrap opt
 
 MAN1=		camlp4.1
-MANLINKS=	camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
-		camlp4.1 ocpp.1
-MANCOMPRESSED=	no
+MLINKS=	camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
+		camlp4.1 ocpp.1 camlp4.1 camlp4o.1 camlp4.1 camlp4r.opt.1 \
+		camlp4.1 camlp4o.opt.1
 
 .include <bsd.port.mk>
diff -ruN camlp4.orig/files/md5 camlp4/files/md5
--- camlp4.orig/files/md5	Tue Aug  1 06:58:29 2000
+++ camlp4/files/md5	Fri Sep 22 14:07:42 2000
@@ -1 +1 @@
-MD5 (camlp4-2.04.tar.gz) = 4998bcc33f421f548e0d98d70d3fa9d9
+MD5 (camlp4-3.00.tar.gz) = 35d918bd70a7d325787346db33733973
diff -ruN camlp4.orig/patches/patch-ab camlp4/patches/patch-ab
--- camlp4.orig/patches/patch-ab	Wed Dec 31 18:00:00 1969
+++ camlp4/patches/patch-ab	Fri Sep 22 15:06:31 2000
@@ -0,0 +1,19 @@
+*** Makefile.orig	Tue Apr 18 10:44:11 2000
+--- Makefile	Fri Sep 22 15:04:48 2000
+***************
+*** 11,17 ****
+  	set -e; for i in $(DIRS); do cd $$i; $(MAKE) all; cd ..; done
+  
+  opt:
+! 	set -e; for i in $(OPTDIRS); do cd $$i; $(MAKE) opt; cd ..; done
+  
+  clean_hot:
+  	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
+--- 11,17 ----
+  	set -e; for i in $(DIRS); do cd $$i; $(MAKE) all; cd ..; done
+  
+  opt:
+! 	cd lib; $(MAKE) opt
+  
+  clean_hot:
+  	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
diff -ruN camlp4.orig/pkg/PLIST camlp4/pkg/PLIST
--- camlp4.orig/pkg/PLIST	Sat Sep 16 17:12:33 2000
+++ camlp4/pkg/PLIST	Fri Sep 22 15:38:50 2000
@@ -62,4 +62,5 @@
 lib/camlp4/plexer.cmx
 lib/camlp4/stdpp.cmx
 lib/camlp4/token.cmx
+lib/camlp4/pa_olabl.cmo
 @dirrm lib/camlp4

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009222051.PAA96883>