cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to findlib-1.1.2pl1

Browse Source
This commit is contained in:
avsm 2006-05-29 03:46:29 +00:00
parent aba30cd0e6
commit 73fcf975c8
7 changed files with 136 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysutils/findlib/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2004/12/30 12:06:22 espie Exp $
# $OpenBSD: Makefile,v 1.6 2006/05/29 03:46:29 avsm Exp $
COMMENT= "Objective Caml package manager"
CATEGORIES= sysutils
DISTNAME= findlib-1.0.4
PKGNAME= ${DISTNAME}p0
DISTNAME= findlib-1.1.2pl1
PKGNAME= ${DISTNAME}
MASTER_SITES= http://www.ocaml-programming.de/packages/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
@ -20,16 +20,10 @@ MODULES= lang/ocaml
LIB_DEPENDS= tk84.1:tk-8.4.*:x11/tk/8.4
NO_REGRESS= Yes
SAMPLE_LOC= ${PREFIX}/share/examples/findlib
SAMPLE_FILE= ${SAMPLE_LOC}/ocamlfind.conf
MAKE_FLAGS= PREFIX=${PREFIX} SYSCONFDIR=${SYSCONFDIR}
FAKE_FLAGS= PREFIX=${PREFIX} SYSCONFDIR=${DESTDIR}${SAMPLE_LOC}
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= -with-toolbox -config ${PREFIX}/share/examples/findlib/findlib.conf
ALL_TARGET= all ${MODOCAML_NATIVE:S,Yes,all opt,:S,No,,}
USE_GMAKE= Yes
SUBST_VARS= SAMPLE_FILE
do-configure:
cp ${WRKSRC}/Makefile.config.pattern ${WRKBUILD}/Makefile.config
.include <bsd.port.mk>

8
sysutils/findlib/distinfo
View File

@ -1,4 +1,4 @@
MD5 (findlib-1.0.4.tar.gz) = dbfabe1b3677a03bcf238ecccb36d84f
RMD160 (findlib-1.0.4.tar.gz) = 71c2ce482666db5df5ad25d57ebb306bbe551e64
SHA1 (findlib-1.0.4.tar.gz) = 405db790d3cb8b04bf6ede7444103ae678a90ef7
SIZE (findlib-1.0.4.tar.gz) = 148287
MD5 (findlib-1.1.2pl1.tar.gz) = df4c9176e9d5b8a6d37668d108fae923
RMD160 (findlib-1.1.2pl1.tar.gz) = 1bd97ac60eb6ba9b3711814d38f7682a5f874cd3
SHA1 (findlib-1.1.2pl1.tar.gz) = ccd8b9d6249b5a4097040d32b90048b11054f461
SIZE (findlib-1.1.2pl1.tar.gz) = 153542

58
sysutils/findlib/patches/patch-Makefile Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-Makefile,v 1.1 2006/05/29 03:46:29 avsm Exp $
--- Makefile.orig Mon Jan 16 23:04:50 2006
+++ Makefile Sun May 28 04:13:27 2006
@@ -22,7 +22,7 @@ install:
$(MAKE) install-meta
cd src/findlib; $(MAKE) install-num-top
$(MAKE) install-config
- cp tools/safe_camlp4 $(OCAMLFIND_BIN)
+ cp tools/safe_camlp4 $(DESTDIR)$(OCAMLFIND_BIN)
uninstall:
$(MAKE) uninstall-doc
@@ -62,32 +62,32 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
- cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
- cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
+ cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
+ cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
.PHONY: uninstall-doc
uninstall-doc:
- rm -f $(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/META.5
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
.PHONY: install-meta
install-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p $(prefix)$(OCAML_SITELIB)/$$x; cp site-lib-src/$$x/META $(prefix)$(OCAML_SITELIB)/$$x; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x; cp site-lib-src/$$x/META $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x; fi; done
.PHONY: uninstall-meta
uninstall-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf $(prefix)$(OCAML_SITELIB)/$$x; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x; fi; done
.PHONY: install-config
install-config:
- mkdir -p `dirname $(prefix)$(OCAMLFIND_CONF)`
- @if [ -f $(prefix)$(OCAMLFIND_CONF) ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
- test -f $(prefix)$(OCAMLFIND_CONF) || cp findlib.conf $(prefix)$(OCAMLFIND_CONF)
+ mkdir -p `dirname $(DESTDIR)$(prefix)$(OCAMLFIND_CONF)`
+ @if [ -f $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
+ test -f $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) || cp findlib.conf $(DESTDIR)$(prefix)$(OCAMLFIND_CONF)
.PHONY: uninstall-config
uninstall-config:

46
sysutils/findlib/patches/patch-Makefile_config_pattern
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-Makefile_config_pattern,v 1.1.1.1 2004/06/12 21:45:34 avsm Exp $
--- Makefile.config.pattern.orig 2004-06-12 10:39:32.000000000 +0100
+++ Makefile.config.pattern 2004-06-12 10:42:39.000000000 +0100
@@ -6,33 +6,33 @@
#----------------------------------------------------------------------
# Where the OCAML core is installed:
#----------------------------------------------------------------------
-OCAML_CORE_STDLIB=/usr/local/lib/ocaml
-OCAML_CORE_BIN=/usr/local/bin
-OCAML_CORE_MAN=/usr/local/man
+OCAML_CORE_STDLIB=${DESTDIR}${PREFIX}/lib/ocaml
+OCAML_CORE_BIN=${DESTDIR}${PREFIX}/bin
+OCAML_CORE_MAN=${DESTDIR}${PREFIX}/man
#----------------------------------------------------------------------
# Type of multi-threading support: either vm or posix
# (Note: Since O'Caml 3.07, "posix" includes "vm", because a build
# supporting posix also supports vm.)
#----------------------------------------------------------------------
-OCAML_THREADS=vm
-#OCAML_THREADS=posix
+#OCAML_THREADS=vm
+OCAML_THREADS=posix
#----------------------------------------------------------------------
# Where the site-lib directory will be
#----------------------------------------------------------------------
-OCAML_SITELIB=/usr/local/lib/ocaml/site-lib
+OCAML_SITELIB=${DESTDIR}${PREFIX}/lib/ocaml/site-lib
#----------------------------------------------------------------------
# Where binaries and manual pages will be installed
#----------------------------------------------------------------------
-OCAMLFIND_BIN=/usr/local/bin
-OCAMLFIND_MAN=/usr/local/man
+OCAMLFIND_BIN=${DESTDIR}${PREFIX}/bin
+OCAMLFIND_MAN=${DESTDIR}${PREFIX}/man
#----------------------------------------------------------------------
# The absolute location of the configuration file
#----------------------------------------------------------------------
-OCAMLFIND_CONF=/usr/local/etc/ocamlfind.conf
+OCAMLFIND_CONF=${SYSCONFDIR}/ocamlfind.conf
#----------------------------------------------------------------------
# Autolinking is usually on

12
sysutils/findlib/patches/patch-src_findlib-toolbox_Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_findlib-toolbox_Makefile,v 1.1 2006/05/29 03:46:29 avsm Exp $
--- src/findlib-toolbox/Makefile.orig Sun May 28 03:53:53 2006
+++ src/findlib-toolbox/Makefile Sun May 28 03:54:03 2006
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
install:
- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
+ cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard

29
sysutils/findlib/patches/patch-src_findlib_Makefile Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_findlib_Makefile,v 1.1 2006/05/29 03:46:29 avsm Exp $
--- src/findlib/Makefile.orig Sun May 28 03:52:22 2006
+++ src/findlib/Makefile Sun May 28 03:53:13 2006
@@ -71,18 +71,18 @@ clean:
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
install: all
- mkdir -p $(prefix)$(OCAML_SITELIB)/$(NAME)
- mkdir -p $(prefix)$(OCAMLFIND_BIN)
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind $(prefix)$(OCAML_CORE_STDLIB)
+ mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
- cp $$files $(prefix)$(OCAML_SITELIB)/$(NAME)
+ cp $$files $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- cp $$f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
+ cp $$f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
install-num-top:
- mkdir -p $(prefix)$(OCAML_SITELIB)/num-top
+ mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top
cp num_top.cma num_top.cmi num_top_printers.cmi \
- $(prefix)$(OCAML_SITELIB)/num-top
+ $(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top
# Note: uninstall-num-top is part of the removal of the META files.

32
sysutils/findlib/pkg/PLIST
View File

@ -1,8 +1,18 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/24 09:40:16 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2006/05/29 03:46:29 avsm Exp $
bin/ocamlfind
bin/safe_camlp4
lib/ocaml/
lib/ocaml/site-lib/
lib/ocaml/site-lib/bigarray/
lib/ocaml/site-lib/bigarray/META
lib/ocaml/site-lib/camlp4/
lib/ocaml/site-lib/camlp4/META
lib/ocaml/site-lib/dbm/
lib/ocaml/site-lib/dbm/META
lib/ocaml/site-lib/dynlink/
lib/ocaml/site-lib/dynlink/META
lib/ocaml/site-lib/findlib/
lib/ocaml/site-lib/findlib/META
lib/ocaml/site-lib/findlib/Makefile.config
lib/ocaml/site-lib/findlib/findlib.cma
lib/ocaml/site-lib/findlib/findlib.cmi
@ -16,16 +26,30 @@ lib/ocaml/site-lib/findlib/make_wizard
lib/ocaml/site-lib/findlib/make_wizard.pattern
lib/ocaml/site-lib/findlib/topfind.cmi
lib/ocaml/site-lib/findlib/topfind.mli
lib/ocaml/site-lib/graphics/
lib/ocaml/site-lib/graphics/META
lib/ocaml/site-lib/labltk/
lib/ocaml/site-lib/labltk/META
lib/ocaml/site-lib/num/
lib/ocaml/site-lib/num-top/
lib/ocaml/site-lib/num-top/META
lib/ocaml/site-lib/num-top/num_top.cma
lib/ocaml/site-lib/num-top/num_top.cmi
lib/ocaml/site-lib/num-top/num_top_printers.cmi
lib/ocaml/site-lib/num/META
lib/ocaml/site-lib/stdlib/
lib/ocaml/site-lib/stdlib/META
lib/ocaml/site-lib/str/
lib/ocaml/site-lib/str/META
lib/ocaml/site-lib/threads/
lib/ocaml/site-lib/threads/META
lib/ocaml/site-lib/unix/
lib/ocaml/site-lib/unix/META
lib/ocaml/topfind
@man man/man1/ocamlfind.1
@man man/man5/META.5
@man man/man5/findlib.conf.5
@man man/man5/site-lib.5
share/examples/findlib/
share/examples/findlib/ocamlfind.conf
@sample ${SYSCONFDIR}/ocamlfind.conf
%%native%%
share/examples/findlib/findlib.conf
@sample ${SYSCONFDIR}/findlib.conf