diff options
| author | jaapb <jaapb> | 2012-09-17 11:45:43 +0000 |
|---|---|---|
| committer | jaapb <jaapb> | 2012-09-17 11:45:43 +0000 |
| commit | 9c3e81ce4ac2115153390ff34e20cb7aafa96a73 (patch) | |
| tree | 6d3974b775762f2aeae9157f873aed146c27611c /databases/ocaml-mysql | |
| parent | 68ce4af02a007a86f219229305ddf8f76ca99a08 (diff) | |
| download | pkgsrc-9c3e81ce4ac2115153390ff34e20cb7aafa96a73.tar.gz | |
Corrected Makefile to build only HTML documentation.
Removed superfluous patches.
Diffstat (limited to 'databases/ocaml-mysql')
| -rw-r--r-- | databases/ocaml-mysql/Makefile | 4 | ||||
| -rw-r--r-- | databases/ocaml-mysql/patches/patch-aa | 13 | ||||
| -rw-r--r-- | databases/ocaml-mysql/patches/patch-ab | 13 | ||||
| -rw-r--r-- | databases/ocaml-mysql/patches/patch-ac | 19 |
4 files changed, 2 insertions, 47 deletions
diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile index 3b2718d6d08..306209e2368 100644 --- a/databases/ocaml-mysql/Makefile +++ b/databases/ocaml-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/09/16 20:12:08 jaapb Exp $ +# $NetBSD: Makefile,v 1.10 2012/09/17 11:45:43 jaapb Exp $ # DISTNAME= ocaml-mysql-1.1.1 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake DOCDIR= ${PREFIX}/share/doc/ocaml-mysql INSTALLATION_DIRS= ${DOCDIR} -BUILD_TARGET= all doc +BUILD_TARGET= all htdoc PLIST_VARS= opt .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \ diff --git a/databases/ocaml-mysql/patches/patch-aa b/databases/ocaml-mysql/patches/patch-aa deleted file mode 100644 index dedf8c0c3bc..00000000000 --- a/databases/ocaml-mysql/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2006/10/14 01:56:57 rillig Exp $ - ---- configure.orig 2006-10-14 03:55:58.000000000 +0200 -+++ configure 2006-10-14 03:56:02.000000000 +0200 -@@ -2945,7 +2945,7 @@ _ACEOF - - fi - --if test "$ac_cv_lib_mysqlclient_mysql_real_connect" == "no"; then -+if test "$ac_cv_lib_mysqlclient_mysql_real_connect" = "no"; then - dirs="/usr/local/lib/mysql - /usr/local/mysql/lib - /usr/local/mysql/lib/mysql diff --git a/databases/ocaml-mysql/patches/patch-ab b/databases/ocaml-mysql/patches/patch-ab deleted file mode 100644 index 679f327776a..00000000000 --- a/databases/ocaml-mysql/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/10/14 01:56:57 rillig Exp $ - ---- configure.in.orig 2006-02-24 00:12:36.000000000 +0100 -+++ configure.in 2006-10-14 03:55:43.000000000 +0200 -@@ -30,7 +30,7 @@ dnl First see if we can link to mysql wi - AC_CHECKING(for MySQL library) - AC_CHECK_LIB(mysqlclient, mysql_real_connect) - dnl If not, look in a bunch of typical places. --if test "$ac_cv_lib_mysqlclient_mysql_real_connect" == "no"; then -+if test "$ac_cv_lib_mysqlclient_mysql_real_connect" = "no"; then - dirs="/usr/local/lib/mysql - /usr/local/mysql/lib - /usr/local/mysql/lib/mysql diff --git a/databases/ocaml-mysql/patches/patch-ac b/databases/ocaml-mysql/patches/patch-ac deleted file mode 100644 index 62e1f363db5..00000000000 --- a/databases/ocaml-mysql/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2010/02/19 22:22:22 joerg Exp $ - ---- OCamlMakefile.orig 2010-01-30 18:14:57.000000000 +0000 -+++ OCamlMakefile -@@ -1102,11 +1102,13 @@ subprojs: $(SUBPROJS:%=subproj_%) - - ########################################################################### - # (UN)INSTALL RULES FOR LIBRARIES -+INSTALLDIR=`$(OCAMLC) -where`/site-lib - - .PHONY: libinstall - libinstall: all - $(QUIET)printf "\nInstalling library with ocamlfind\n" -- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES) -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR) -+ $(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}$(INSTALLDIR) $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES) - $(QUIET)printf "\nInstallation successful.\n" - - .PHONY: libuninstall |