[pkgsrc/trunk]: pkgsrc/graphics/camlimages Move shared library entries into t...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cfe41546f184
branches:  trunk
changeset: 511809:cfe41546f184
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Apr 22 17:07:19 2006 +0000

description:
Move shared library entries into the main PLIST and use them
conditionally on Darwin, DragonFly and FreeBSD. Bump revision.

diffstat:

 graphics/camlimages/Makefile     |  10 ++++++----
 graphics/camlimages/PLIST        |   8 +++++++-
 graphics/camlimages/PLIST.Darwin |   8 --------
 3 files changed, 13 insertions(+), 13 deletions(-)

diffs (60 lines):

diff -r 9db44f809e66 -r cfe41546f184 graphics/camlimages/Makefile
--- a/graphics/camlimages/Makefile      Sat Apr 22 16:49:48 2006 +0000
+++ b/graphics/camlimages/Makefile      Sat Apr 22 17:07:19 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/22 17:07:19 joerg Exp $
 
 DISTNAME=              camlimages-2.2.0
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            graphics
 MASTER_SITES=          ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 EXTRACT_SUFX=          .tgz
@@ -28,8 +28,10 @@
 PLIST_SRC+=    ${PKGDIR}/PLIST.opt
 .endif
 
-.if ${OPSYS} == "Darwin"
-PLIST_SRC+=    ${PKGDIR}/PLIST.Darwin
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Darwin"
+PLIST_SUBST+=  COND_DLL=""
+.else
+PLIST_SUBST+=  COND_DLL="@comment "
 .endif
 
 .include "../../lang/ocaml/buildlink3.mk"
diff -r 9db44f809e66 -r cfe41546f184 graphics/camlimages/PLIST
--- a/graphics/camlimages/PLIST Sat Apr 22 16:49:48 2006 +0000
+++ b/graphics/camlimages/PLIST Sat Apr 22 17:07:19 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/11/08 22:36:42 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/22 17:07:19 joerg Exp $
 lib/ocaml/camlimages/Makefile.config
 lib/ocaml/camlimages/bitmap.cmi
 lib/ocaml/camlimages/bitmap.cmo
@@ -47,6 +47,12 @@
 lib/ocaml/camlimages/colorhist.cmx
 lib/ocaml/camlimages/colorhist.o
 lib/ocaml/camlimages/config.h
+${COND_DLL}lib/ocaml/camlimages/dllci_freetype.so
+${COND_DLL}lib/ocaml/camlimages/dllci_gif.so
+${COND_DLL}lib/ocaml/camlimages/dllci_jpeg.so
+${COND_DLL}lib/ocaml/camlimages/dllci_png.so
+${COND_DLL}lib/ocaml/camlimages/dllci_tiff.so
+${COND_DLL}lib/ocaml/camlimages/dllci_xpm.so
 lib/ocaml/camlimages/freetype.cmi
 lib/ocaml/camlimages/freetype.cmo
 lib/ocaml/camlimages/freetype.cmx
diff -r 9db44f809e66 -r cfe41546f184 graphics/camlimages/PLIST.Darwin
--- a/graphics/camlimages/PLIST.Darwin  Sat Apr 22 16:49:48 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2005/11/08 22:36:42 rillig Exp $
-lib/ocaml/camlimages/dllci_freetype.so
-lib/ocaml/camlimages/dllci_gif.so
-lib/ocaml/camlimages/dllci_jpeg.so
-lib/ocaml/camlimages/dllci_png.so
-lib/ocaml/camlimages/dllci_tiff.so
-lib/ocaml/camlimages/dllci_xpm.so
-@unexec ${RMDIR} %D/lib/ocaml/camlimages 2>/dev/null || ${TRUE}