pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

p5-PerlMagick and no X11



ImageMagick can be built without X11. It would nice if p5-PerlMagick can 
be built without X also.

diff -u -r1.17 buildlink3.mk
--- graphics/ImageMagick/buildlink3.mk  8 Jul 2006 23:10:50 -0000       1.17
+++ graphics/ImageMagick/buildlink3.mk  30 Dec 2006 16:36:41 -0000
@@ -17,11 +17,25 @@
 BUILDLINK_PKGSRCDIR.ImageMagick?=      ../../graphics/ImageMagick
 .endif # IMAGEMAGICK_BUILDLINK3_MK
 
-.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !defined(PKG_BUILD_OPTIONS.ImageMagick)
+PKG_BUILD_OPTIONS.ImageMagick!= \
+       cd ${BUILDLINK_PKGSRCDIR.ImageMagick} && \
+       ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=    PKG_BUILD_OPTIONS.ImageMagick=${PKG_BUILD_OPTIONS.ImageMagick:Q}
+.endif
+MAKEVARS+=     PKG_BUILD_OPTIONS.ImageMagick
+
+.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11)
+BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0
 .include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/libwmf/buildlink3.mk"
+.endif
+
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}

The above should be ready to commit.

Also maybe the Makefile.common should handle the
CONFIGURE_ARGS+=        --without-x
or Makefile.common should include the options?

Or is it okay if p5-PerlMagick/Makefile also include 
../../graphics/ImageMagick/options.mk??





Home | Main Index | Thread Index | Old Index