From ssedov@mbsd.msk.ru  Tue Aug  1 08:57:14 2006
Return-Path: <ssedov@mbsd.msk.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8470A16A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Aug 2006 08:57:14 +0000 (UTC)
	(envelope-from ssedov@mbsd.msk.ru)
Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B93A543D46
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Aug 2006 08:57:13 +0000 (GMT)
	(envelope-from ssedov@mbsd.msk.ru)
Received: from [217.118.83.1] (helo=fonon.realnet)
	by com1.ht-systems.ru with esmtpa (Exim 4.62)
	(envelope-from <ssedov@mbsd.msk.ru>)
	id 1G7qBc-0003KD-Kv
	for FreeBSD-gnats-submit@freebsd.org; Tue, 01 Aug 2006 13:05:15 +0400
Received: by fonon.realnet (Postfix, from userid 1001)
	id 0BCC6121EA; Tue,  1 Aug 2006 12:56:45 +0400 (MSD)
Message-Id: <20060801085645.0BCC6121EA@fonon.realnet>
Date: Tue,  1 Aug 2006 12:56:45 +0400 (MSD)
From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] devel/ocaml-classes: CFLAGS safeness, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         101148
>Category:       ports
>Synopsis:       [PATCH] devel/ocaml-classes: CFLAGS safeness, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 01 09:00:31 GMT 2006
>Closed-Date:    Wed Aug 02 08:25:14 GMT 2006
>Last-Modified:  Wed Aug 02 08:25:14 GMT 2006
>Originator:     Stanislav Sedov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
- CFLAGS safeness
- Honour PREFIX
- Add missing RUN_DEPEND
- Take maintainership

>How-To-Repeat:
>Fix:

--- ocaml-classes-3.05_1.patch begins here ---
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
--- ocaml-classes-3.05_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Tue Aug 1 15:31:48 UTC 2006 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101148 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Wed Aug 2 08:25:13 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101148 
>Unformatted:
