Attachment #70117 for bug #102382

View | Details | Raw Unified | Return to bug 102382
Collapse All | Expand All

Lines 7-14 Link Here

(-)/var/tmp/ocaml-camomile/Makefile (-4 / +6 lines)
7	#	7	#
8		8
9	PORTNAME= camomile	9	PORTNAME= camomile
10	PORTVERSION= 0.6.6	10	PORTVERSION= 0.7.1
11	PORTREVISION= 1	11	PORTREVISION= 0
12	CATEGORIES= devel	12	CATEGORIES= devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	14	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 28-33 Link Here
28	DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}	28	DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
29	EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME}	29	EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME}
30		30
		31	PLIST_FILES= bin/camomilecharmap \
		32	bin/camomilelocaledef
		33
31	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
32	.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"	35	.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
33		36
Lines 35-42 Link Here
35	BROKEN= Need working <wctype.h>	38	BROKEN= Need working <wctype.h>
36	.endif	39	.endif
37		40
38	post-extract:	41	post-patch:
39	@${CP} ${WRKSRC}/META ${WRKSRC}/META.in
40	@${REINPLACE_CMD} -E -e \	42	@${REINPLACE_CMD} -E -e \
41	"s,([[:space:]])cp[[:space:]]-f,\1\$${BSD_INSTALL_DATA}," \	43	"s,([[:space:]])cp[[:space:]]-f,\1\$${BSD_INSTALL_DATA}," \
42	${WRKSRC}/Makefile.in	44	${WRKSRC}/Makefile.in

Lines 1-3 Link Here

(-)/var/tmp/ocaml-camomile/distinfo (-3 / +3 lines)
1	MD5 (camomile-0.6.6.tar.bz2) = 3b4f19bc172189c17254e74abaa9644c	1	MD5 (camomile-0.7.1.tar.bz2) = 9b8cedcf91e9795f85aaade5a6f1c515
2	SHA256 (camomile-0.6.6.tar.bz2) = 1de5d220dedc5684117aee4d7372e82358f01134bef131c8aeb1d25240d1c23f	2	SHA256 (camomile-0.7.1.tar.bz2) = 9103ff245ab8265e5bdbb2cfa1028ab5ea06b660bf59ecb4c3fd6ae4ad523e9f
3	SIZE (camomile-0.6.6.tar.bz2) = 2124681	3	SIZE (camomile-0.7.1.tar.bz2) = 2133102




--- Makefile.in.orig	Tue Aug 22 13:35:58 2006
+++ Makefile.in	Tue Aug 22 13:36:45 2006
@@ -375,8 +375,10 @@
 	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi
 
 install-bin:
-	cp -f tools/camomilecharmap.$(OCAMLBEST) $(BINDIR)
-	cp -f tools/camomilelocaledef.$(OCAMLBEST) $(BINDIR)
+	${BSD_INSTALL_PROGRAM} tools/camomilecharmap.$(OCAMLBEST) \
+		$(BINDIR)/camomilecharmap
+	${BSD_INSTALL_PROGRAM} tools/camomilelocaledef.$(OCAMLBEST) \
+		$(BINDIR)/camomilelocaledef
 
 install-data:
 	mkdir -p $(DATADIR)

Return to bug 102382

Lines 1-11 Link Here

(-)/var/tmp/ocaml-camomile/files/patch-Makefile.in (-10 / +14 lines)
1	--- Makefile.in.orig Tue Aug 1 16:47:03 2006	1	--- Makefile.in.orig Tue Aug 22 13:35:58 2006
2	+++ Makefile.in Tue Aug 1 16:47:47 2006	2	+++ Makefile.in Tue Aug 22 13:36:45 2006
3	@@ -378,7 +378,7 @@	3	@@ -375,8 +375,10 @@
		4	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi
4		5
5	install-with-ocamlfind:	6	install-bin:
6	files= &&\	7	- cp -f tools/camomilecharmap.$(OCAMLBEST) $(BINDIR)
7	- if [ $(OCAMLBEST) = opt ]; then files=public/*.cmx; fi && \	8	- cp -f tools/camomilelocaledef.$(OCAMLBEST) $(BINDIR)
8	+ if [ "$(OCAMLBEST)" = "opt" ]; then files=public/*.cmx; fi && \	9	+ ${BSD_INSTALL_PROGRAM} tools/camomilecharmap.$(OCAMLBEST) \
9	if [ -f camomile.cma ]; then files="camomile.* $$files"; fi&& \	10	+ $(BINDIR)/camomilecharmap
10	if [ -f libcamomile.a ]; then files="libcamomile.a $$files"; fi && \	11	+ ${BSD_INSTALL_PROGRAM} tools/camomilelocaledef.$(OCAMLBEST) \
11	if [ -f dllcamomile.so ]; then files="dllcamomile.so $$files"; fi && \	12	+ $(BINDIR)/camomilelocaledef
		13
		14	install-data:
		15	mkdir -p $(DATADIR)