[92002] trunk/dports/devel/ocaml-ocamlnet

landonf at macports.org landonf at macports.org
Sun Apr 15 14:41:04 PDT 2012


Revision: 92002
          https://trac.macports.org/changeset/92002
Author:   landonf at macports.org
Date:     2012-04-15 14:41:01 -0700 (Sun, 15 Apr 2012)
Log Message:
-----------
Avoid attempting to use a specific MacPorts-defined version of cpp. This fixes #32061.

Modified Paths:
--------------
    trunk/dports/devel/ocaml-ocamlnet/Portfile

Removed Paths:
-------------
    trunk/dports/devel/ocaml-ocamlnet/files/patch-rpcgen.diff

Modified: trunk/dports/devel/ocaml-ocamlnet/Portfile
===================================================================
--- trunk/dports/devel/ocaml-ocamlnet/Portfile	2012-04-15 19:00:52 UTC (rev 92001)
+++ trunk/dports/devel/ocaml-ocamlnet/Portfile	2012-04-15 21:41:01 UTC (rev 92002)
@@ -34,16 +34,10 @@
 # ocaml is not universal
 universal_variant   no
 
-patchfiles          patch-rpcgen.diff
-
 post-patch {
     set ocaml_site_path [exec ocamlfind printconf destdir]
     reinplace       "s|\$(OCAMLFIND) install|\$(OCAMLFIND) install -destdir ${destroot}/${ocaml_site_path}|g" \
                     ${worksrcpath}/Makefile
-    reinplace       "s|@CPP@|${configure.cpp}|g" \
-                    ${worksrcpath}/src/netplex/Makefile.pre \
-                    ${worksrcpath}/src/rpc/Makefile.pre \
-                    ${worksrcpath}/src/rpc-auth-dh/Makefile.pre
 }
 
 configure.pre_args

Deleted: trunk/dports/devel/ocaml-ocamlnet/files/patch-rpcgen.diff
===================================================================
--- trunk/dports/devel/ocaml-ocamlnet/files/patch-rpcgen.diff	2012-04-15 19:00:52 UTC (rev 92001)
+++ trunk/dports/devel/ocaml-ocamlnet/files/patch-rpcgen.diff	2012-04-15 21:41:01 UTC (rev 92002)
@@ -1,30 +0,0 @@
---- src/netplex/Makefile.pre	2007-11-01 17:12:32.000000000 -0500
-+++ src/netplex/Makefile.pre	2009-07-31 11:58:14.000000000 -0500
-@@ -4,7 +4,7 @@
- PKGNAME = netplex
- GENERATE = netplex_ctrl_aux.ml netplex_ctrl_clnt.ml netplex_ctrl_srv.ml META
- PACKLIST = netplex-packlist
--RPCGEN = ../rpc-generator/ocamlrpcgen
-+RPCGEN = ../rpc-generator/ocamlrpcgen -cpp @CPP@
- 
- INSTALL_EXTRA = netplex-packlist netplex_mt.cmo netplex_mt.cmx netplex_mt.o
- INSTOTHER = install-netplex-admin
---- src/rpc/Makefile.pre	2007-11-01 17:12:32.000000000 -0500
-+++ src/rpc/Makefile.pre	2009-07-31 11:58:11.000000000 -0500
-@@ -5,7 +5,7 @@
- 
- GENERATE = rpc_portmapper_aux.ml rpc_portmapper_clnt.ml META
- 
--RPCGEN = ../rpc-generator/ocamlrpcgen
-+RPCGEN = ../rpc-generator/ocamlrpcgen -cpp @CPP@
- 
- include $(TOP_DIR)/Makefile.rules
- 
---- src/rpc-auth-dh/Makefile.pre	2007-11-01 17:12:33.000000000 -0500
-+++ src/rpc-auth-dh/Makefile.pre	2009-07-31 11:58:08.000000000 -0500
-@@ -18,4 +18,4 @@
- 	sed -e "s/@CONNECTOR@/$(RPC_AUTH_DH_CONNECTOR)/" \
- 		rpc_key_service.mlp >rpc_key_service.ml
- 
--RPCGEN = ../rpc-generator/ocamlrpcgen
-+RPCGEN = ../rpc-generator/ocamlrpcgen -cpp @CPP@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120415/1907a227/attachment.html>


More information about the macports-changes mailing list