diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2013-12-15 12:22:29 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2013-12-15 12:22:29 +0000 |
| commit | b0cffb142cdec52339e085f0cd8895ba8dfe1be9 (patch) | |
| tree | 66dc54346edfa8e1b55b559ce81e160547c04a6d /graphics/tiff | |
| parent | shells/jailkit: fix python usage (diff) | |
- use X11_CONFIGURE_WITH, X11_USE
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/Makefile | 12 | ||||
| -rw-r--r-- | graphics/tiff/pkg-plist | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 3037834c1b8c..58895ffe5a7b 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -81,6 +81,9 @@ MLINKS= TIFFError.3tiff TIFFSetErrorHandler.3tiff \ OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 +OPTIONS_SUB= yes +X11_CONFIGURE_WITH= x libgl +X11_USE= xorg=sm,ice,xmu,xi,x11 gl=glut,glu,gl .include <bsd.port.options.mk> @@ -93,15 +96,6 @@ __pmlinks3!= ${ECHO_CMD} '${MLINKS:S/ / /}' | ${AWK} \ } }' .endif -.if ${PORT_OPTIONS:MX11} -USE_XORG= sm ice xmu xi x11 -USE_GL= glut glu gl -PLIST_SUB+= WITH_X11="" -.else -CONFIGURE_ARGS+= --without-x --without-libgl -PLIST_SUB+= WITH_X11="@comment " -.endif - pre-configure: ${REINPLACE_CMD} \ -e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \ diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index e945bbfbb7c7..dec8fefa267f 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -17,7 +17,7 @@ bin/tiffcp bin/tiffcrop bin/tiffdither bin/tiffdump -%%WITH_X11%%bin/tiffgt +%%X11%%bin/tiffgt bin/tiffinfo bin/tiffmedian bin/tiffset |