diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-22 17:07:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-22 17:07:19 +0000 |
| commit | 703f1478b7a5a2b2ceff4229bc979a709cb64ac7 (patch) | |
| tree | 8617af192e883c811dacbc48a9964e61d58c14e6 /graphics | |
| parent | f044a55ea13642328fe5b007eaff18de95bbf3de (diff) | |
| download | pkgsrc-703f1478b7a5a2b2ceff4229bc979a709cb64ac7.tar.gz | |
Move shared library entries into the main PLIST and use them
conditionally on Darwin, DragonFly and FreeBSD. Bump revision.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/camlimages/Makefile | 10 | ||||
| -rw-r--r-- | graphics/camlimages/PLIST | 8 | ||||
| -rw-r--r-- | graphics/camlimages/PLIST.Darwin | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index 0c28b55e64e..1acad0f65c3 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -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 @@ BUILD_TARGET+= all 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 --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST index a30c1d8aadd..d6108db14d5 100644 --- a/graphics/camlimages/PLIST +++ b/graphics/camlimages/PLIST @@ -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.cmo 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 --git a/graphics/camlimages/PLIST.Darwin b/graphics/camlimages/PLIST.Darwin deleted file mode 100644 index ba05ffc00c9..00000000000 --- a/graphics/camlimages/PLIST.Darwin +++ /dev/null @@ -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} |