and corresponding entry in ../Makefile of course.
Cheers.
Index: Makefile
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 2 Dec 2011 14:36:14 -0000 1.23
+++ Makefile 8 May 2012 03:28:04 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT= image processing tools with stable ABI
DISTNAME= GraphicsMagick-1.3.12
-REVISION= 3
+REVISION= 4
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
@@ -24,7 +24,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= bz2 c jasper jbig lcms ltdl jpeg xcb \
- m png pthread stdc++ tiff xml2 z ${MODLIBICONV_WANTLIB}
+ m png pthread stdc++ tiff xml2 z \
+ ICE SM X11 Xext freetype wmflite-0.2 xcb
MODULES= converters/libiconv
@@ -33,15 +34,21 @@ LIB_DEPENDS= archivers/bzip2 \
graphics/jasper \
graphics/jbigkit \
graphics/lcms \
+ graphics/libwmf \
graphics/png \
graphics/tiff \
textproc/libxml
+RUN_DEPENDS= print/ghostscript/gnu \
+ print/transfig
+BUILD_DEPENDS= ${RUN_DEPENDS}
+
USE_LIBTOOL= Yes
USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-quantum-depth=16 \
+ --with-wmf \
--without-dps \
--without-fpx \
--without-gslib \
@@ -51,35 +58,11 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
--disable-ltdl-install
+
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng
-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs
-L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
PTHREAD_LIBS="-pthread" \
ac_cv_path_LaunchDelegate=no
-
-FLAVORS= no_x11
-FLAVOR?=
-
-.if ${FLAVOR:Mno_x11}
-BUILD_DEPENDS+= print/ghostscript/gnu,no_x11
-RUN_DEPENDS+= print/ghostscript/gnu,no_x11
-CONFIGURE_ENV+= ac_cv_path_FIGDecodeDelegate=no
-CONFIGURE_ARGS+= --without-x \
- --without-ttf \
- --without-wmf
-PKG_ARGS+= -Dx11=0
-.else
-WANTLIB+= ICE SM X11 Xext freetype wmflite-0.2 xcb
-LIB_DEPENDS+= graphics/libwmf
-BUILD_DEPENDS+= print/ghostscript/gnu \
- print/transfig
-RUN_DEPENDS+= print/ghostscript/gnu \
- print/transfig
-CONFIGURE_ARGS+= --with-wmf
-PKG_ARGS+= -Dx11=1
-.endif
-
-# with FLAVOR=no_x11, some regession tests do not pass
-# due to the absence of freetype
post-build:
@cd ${WRKBUILD}/PerlMagick && perl Makefile.PL && ${MAKE} ${MAKE_FLAGS}
Index: pkg/PFRAG.x11
===================================================================
RCS file: pkg/PFRAG.x11
diff -N pkg/PFRAG.x11
--- pkg/PFRAG.x11 15 Jan 2011 16:17:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.x11,v 1.1 2011/01/15 16:17:33 jasper Exp $
-@comment lib/GraphicsMagick/modules-Q16/coders/x.a
-lib/GraphicsMagick/modules-Q16/coders/x.la
-lib/GraphicsMagick/modules-Q16/coders/x.so
-@comment lib/GraphicsMagick/modules-Q16/coders/xwd.a
-lib/GraphicsMagick/modules-Q16/coders/xwd.la
-lib/GraphicsMagick/modules-Q16/coders/xwd.so
Index: pkg/PLIST
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/graphics/GraphicsMagick/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 15 Jan 2011 16:17:33 -0000 1.7
+++ pkg/PLIST 8 May 2012 03:24:13 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.7 2011/01/15 16:17:33 jasper Exp $
+@pkgpath graphics/GraphicsMagick,no_x11
bin/GraphicsMagick++-config
bin/GraphicsMagick-config
bin/GraphicsMagickWand-config
@@ -97,7 +98,6 @@ lib/GraphicsMagick/config/type-windows.m
lib/GraphicsMagick/config/type.mgk
lib/GraphicsMagick/modules-Q16/
lib/GraphicsMagick/modules-Q16/coders/
-%%x11%%
@comment lib/GraphicsMagick/modules-Q16/coders/art.a
lib/GraphicsMagick/modules-Q16/coders/art.la
lib/GraphicsMagick/modules-Q16/coders/art.so
@@ -356,6 +356,9 @@ lib/GraphicsMagick/modules-Q16/coders/wm
@comment lib/GraphicsMagick/modules-Q16/coders/wpg.a
lib/GraphicsMagick/modules-Q16/coders/wpg.la
lib/GraphicsMagick/modules-Q16/coders/wpg.so
+@comment lib/GraphicsMagick/modules-Q16/coders/x.a
+lib/GraphicsMagick/modules-Q16/coders/x.la
+lib/GraphicsMagick/modules-Q16/coders/x.so
@comment lib/GraphicsMagick/modules-Q16/coders/xbm.a
lib/GraphicsMagick/modules-Q16/coders/xbm.la
lib/GraphicsMagick/modules-Q16/coders/xbm.so
@@ -368,6 +371,9 @@ lib/GraphicsMagick/modules-Q16/coders/xc
@comment lib/GraphicsMagick/modules-Q16/coders/xpm.a
lib/GraphicsMagick/modules-Q16/coders/xpm.la
lib/GraphicsMagick/modules-Q16/coders/xpm.so
+@comment lib/GraphicsMagick/modules-Q16/coders/xwd.a
+lib/GraphicsMagick/modules-Q16/coders/xwd.la
+lib/GraphicsMagick/modules-Q16/coders/xwd.so
@comment lib/GraphicsMagick/modules-Q16/coders/yuv.a
lib/GraphicsMagick/modules-Q16/coders/yuv.la
lib/GraphicsMagick/modules-Q16/coders/yuv.so
