Date: Thu, 14 Nov 2013 17:14:34 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333776 - head/graphics/tiff Message-ID: <201311141714.rAEHEYPK010996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Thu Nov 14 17:14:33 2013 New Revision: 333776 URL: http://svnweb.freebsd.org/changeset/ports/333776 Log: - use STAGEDIR Modified: head/graphics/tiff/Makefile head/graphics/tiff/pkg-plist Modified: head/graphics/tiff/Makefile ============================================================================== --- head/graphics/tiff/Makefile Thu Nov 14 17:08:44 2013 (r333775) +++ head/graphics/tiff/Makefile Thu Nov 14 17:14:33 2013 (r333776) @@ -13,46 +13,14 @@ COMMENT= Tools and library routines for LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - jbig:${PORTSDIR}/graphics/jbigkit - -NO_STAGE= yes +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjbig.so:${PORTSDIR}/graphics/jbigkit USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \ --with-jpeg-lib-dir=${LOCALBASE}/lib -.if defined(WITH_X11) && !defined(WITHOUT_X11) -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 - -MAN1= bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \ - ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \ - thumbnail.1 tiff2bw.1 tiff2ps.1 tiff2rgba.1 tiffcmp.1 tiffcp.1 \ - tiffcrop.1 tiffdither.1 tiffdump.1 tiffgt.1 tiffinfo.1 tiffmedian.1 \ - tiffset.1 tiffsplit.1 tiffsv.1 -MAN3= TIFFClose.3tiff TIFFDataWidth.3tiff TIFFError.3tiff \ - TIFFFieldDataType.3tiff TIFFFieldName.3tiff TIFFFieldPassCount.3tiff \ - TIFFFieldReadCount.3tiff TIFFFieldTag.3tiff TIFFFieldWriteCount.3tiff \ - TIFFFlush.3tiff TIFFGetField.3tiff TIFFOpen.3tiff \ - TIFFPrintDirectory.3tiff TIFFRGBAImage.3tiff TIFFReadDirectory.3tiff \ - TIFFReadEncodedStrip.3tiff TIFFReadEncodedTile.3tiff \ - TIFFReadRGBAImage.3tiff TIFFReadRGBAStrip.3tiff \ - TIFFReadRGBATile.3tiff TIFFReadRawStrip.3tiff TIFFReadRawTile.3tiff \ - TIFFReadScanline.3tiff TIFFReadTile.3tiff TIFFSetDirectory.3tiff \ - TIFFSetField.3tiff TIFFWarning.3tiff TIFFWriteDirectory.3tiff \ - TIFFWriteEncodedStrip.3tiff TIFFWriteEncodedTile.3tiff \ - TIFFWriteRawStrip.3tiff TIFFWriteRawTile.3tiff \ - TIFFWriteScanline.3tiff TIFFWriteTile.3tiff TIFFbuffer.3tiff \ - TIFFcodec.3tiff TIFFcolor.3tiff TIFFmemory.3tiff TIFFquery.3tiff \ - TIFFsize.3tiff TIFFstrip.3tiff TIFFswab.3tiff TIFFtile.3tiff \ - libtiff.3tiff MLINKS= TIFFError.3tiff TIFFSetErrorHandler.3tiff \ TIFFFlush.3tiff TIFFFlushData.3tiff \ TIFFGetField.3tiff TIFFGetFieldDefaulted.3tiff \ @@ -111,6 +79,29 @@ MLINKS= TIFFError.3tiff TIFFSet TIFFtile.3tiff TIFFTileRowSize.3tiff \ TIFFtile.3tiff TIFFVTileSize.3tiff +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + +.if !defined(BUILDING_INDEX) +__pmlinks3!= ${ECHO_CMD} '${MLINKS:S/ / /}' | ${AWK} \ + '{ if (NF % 2 != 0) { print "broken"; exit; } \ + for (i=1; i<=NF; i++) { \ + if ( i % 2 == 0) { print " " $$i " ;"; } \ + else { printf "${LN} -s " $$i " "; } \ + } }' +.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|' \ @@ -118,13 +109,14 @@ pre-configure: ${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \ -e 's|man html|man|' ${WRKSRC}/Makefile.in -.if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man - ${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/ - ${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/ - ${INSTALL_DATA} ${WRKSRC}/html/man/*.html ${DOCSDIR}/man/ + ( cd ${STAGEDIR}${MANPREFIX}/man/man3 && ${__pmlinks3} ) +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/images ${STAGEDIR}${DOCSDIR}/man + ${INSTALL_DATA} ${WRKSRC}/html/*.html ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${STAGEDIR}${DOCSDIR}/images/ + ${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${STAGEDIR}${DOCSDIR}/images/ + ${INSTALL_DATA} ${WRKSRC}/html/man/*.html ${STAGEDIR}${DOCSDIR}/man/ .endif regression-test: build Modified: head/graphics/tiff/pkg-plist ============================================================================== --- head/graphics/tiff/pkg-plist Thu Nov 14 17:08:44 2013 (r333775) +++ head/graphics/tiff/pkg-plist Thu Nov 14 17:14:33 2013 (r333776) @@ -36,6 +36,133 @@ lib/libtiffxx.la lib/libtiffxx.so lib/libtiffxx.so.4 libdata/pkgconfig/libtiff-4.pc +man/man1/bmp2tiff.1.gz +man/man1/fax2ps.1.gz +man/man1/fax2tiff.1.gz +man/man1/gif2tiff.1.gz +man/man1/pal2rgb.1.gz +man/man1/ppm2tiff.1.gz +man/man1/ras2tiff.1.gz +man/man1/raw2tiff.1.gz +man/man1/rgb2ycbcr.1.gz +man/man1/sgi2tiff.1.gz +man/man1/thumbnail.1.gz +man/man1/tiff2bw.1.gz +man/man1/tiff2pdf.1.gz +man/man1/tiff2ps.1.gz +man/man1/tiff2rgba.1.gz +man/man1/tiffcmp.1.gz +man/man1/tiffcp.1.gz +man/man1/tiffcrop.1.gz +man/man1/tiffdither.1.gz +man/man1/tiffdump.1.gz +man/man1/tiffgt.1.gz +man/man1/tiffinfo.1.gz +man/man1/tiffmedian.1.gz +man/man1/tiffset.1.gz +man/man1/tiffsplit.1.gz +man/man1/tiffsv.1.gz +man/man3/TIFFCheckTile.3tiff.gz +man/man3/TIFFClientOpen.3tiff.gz +man/man3/TIFFClose.3tiff.gz +man/man3/TIFFComputeStrip.3tiff.gz +man/man3/TIFFComputeTile.3tiff.gz +man/man3/TIFFCurrentDirectory.3tiff.gz +man/man3/TIFFCurrentRow.3tiff.gz +man/man3/TIFFCurrentStrip.3tiff.gz +man/man3/TIFFCurrentTile.3tiff.gz +man/man3/TIFFDataWidth.3tiff.gz +man/man3/TIFFDefaultStripSize.3tiff.gz +man/man3/TIFFDefaultTileSize.3tiff.gz +man/man3/TIFFError.3tiff.gz +man/man3/TIFFFdOpen.3tiff.gz +man/man3/TIFFFieldDataType.3tiff.gz +man/man3/TIFFFieldName.3tiff.gz +man/man3/TIFFFieldPassCount.3tiff.gz +man/man3/TIFFFieldReadCount.3tiff.gz +man/man3/TIFFFieldTag.3tiff.gz +man/man3/TIFFFieldWriteCount.3tiff.gz +man/man3/TIFFFileName.3tiff.gz +man/man3/TIFFFileno.3tiff.gz +man/man3/TIFFFindCODEC.3tiff.gz +man/man3/TIFFFlush.3tiff.gz +man/man3/TIFFFlushData.3tiff.gz +man/man3/TIFFGetField.3tiff.gz +man/man3/TIFFGetFieldDefaulted.3tiff.gz +man/man3/TIFFGetMode.3tiff.gz +man/man3/TIFFIsByteSwapped.3tiff.gz +man/man3/TIFFIsMSB2LSB.3tiff.gz +man/man3/TIFFIsTiled.3tiff.gz +man/man3/TIFFIsUpSampled.3tiff.gz +man/man3/TIFFLastDirectory.3tiff.gz +man/man3/TIFFNumberOfStrips.3tiff.gz +man/man3/TIFFNumberOfTiles.3tiff.gz +man/man3/TIFFOpen.3tiff.gz +man/man3/TIFFPrintDirectory.3tiff.gz +man/man3/TIFFRGBAImage.3tiff.gz +man/man3/TIFFRGBAImageBegin.3tiff.gz +man/man3/TIFFRGBAImageEnd.3tiff.gz +man/man3/TIFFRGBAImageGet.3tiff.gz +man/man3/TIFFRGBAImageOK.3tiff.gz +man/man3/TIFFReadBufferSetup.3tiff.gz +man/man3/TIFFReadDirectory.3tiff.gz +man/man3/TIFFReadEncodedStrip.3tiff.gz +man/man3/TIFFReadEncodedTile.3tiff.gz +man/man3/TIFFReadRGBAImage.3tiff.gz +man/man3/TIFFReadRGBAImageOriented.3tiff.gz +man/man3/TIFFReadRGBAStrip.3tiff.gz +man/man3/TIFFReadRGBATile.3tiff.gz +man/man3/TIFFReadRawStrip.3tiff.gz +man/man3/TIFFReadRawTile.3tiff.gz +man/man3/TIFFReadScanline.3tiff.gz +man/man3/TIFFReadTile.3tiff.gz +man/man3/TIFFRegisterCODEC.3tiff.gz +man/man3/TIFFReverseBits.3tiff.gz +man/man3/TIFFRewriteDirectory.3tiff.gz +man/man3/TIFFScanlineSize.3tiff.gz +man/man3/TIFFSetDirectory.3tiff.gz +man/man3/TIFFSetErrorHandler.3tiff.gz +man/man3/TIFFSetField.3tiff.gz +man/man3/TIFFSetSubDirectory.3tiff.gz +man/man3/TIFFSetWarningHandler.3tiff.gz +man/man3/TIFFStripSize.3tiff.gz +man/man3/TIFFSwabArrayOfLong.3tiff.gz +man/man3/TIFFSwabArrayOfShort.3tiff.gz +man/man3/TIFFSwabLong.3tiff.gz +man/man3/TIFFSwabShort.3tiff.gz +man/man3/TIFFTileRowSize.3tiff.gz +man/man3/TIFFTileSize.3tiff.gz +man/man3/TIFFUnRegisterCODEC.3tiff.gz +man/man3/TIFFVGetField.3tiff.gz +man/man3/TIFFVGetFieldDefaulted.3tiff.gz +man/man3/TIFFVSetField.3tiff.gz +man/man3/TIFFVStripSize.3tiff.gz +man/man3/TIFFVTileSize.3tiff.gz +man/man3/TIFFWarning.3tiff.gz +man/man3/TIFFWriteBufferSetup.3tiff.gz +man/man3/TIFFWriteDirectory.3tiff.gz +man/man3/TIFFWriteEncodedStrip.3tiff.gz +man/man3/TIFFWriteEncodedTile.3tiff.gz +man/man3/TIFFWriteRawStrip.3tiff.gz +man/man3/TIFFWriteRawTile.3tiff.gz +man/man3/TIFFWriteScanline.3tiff.gz +man/man3/TIFFWriteTile.3tiff.gz +man/man3/TIFFbuffer.3tiff.gz +man/man3/TIFFcodec.3tiff.gz +man/man3/TIFFcolor.3tiff.gz +man/man3/TIFFfree.3tiff.gz +man/man3/TIFFmalloc.3tiff.gz +man/man3/TIFFmemcmp.3tiff.gz +man/man3/TIFFmemcpy.3tiff.gz +man/man3/TIFFmemory.3tiff.gz +man/man3/TIFFmemset.3tiff.gz +man/man3/TIFFquery.3tiff.gz +man/man3/TIFFrealloc.3tiff.gz +man/man3/TIFFsize.3tiff.gz +man/man3/TIFFstrip.3tiff.gz +man/man3/TIFFswab.3tiff.gz +man/man3/TIFFtile.3tiff.gz +man/man3/libtiff.3tiff.gz %%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html %%PORTDOCS%%%%DOCSDIR%%/addingtags.html %%PORTDOCS%%%%DOCSDIR%%/bugs.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311141714.rAEHEYPK010996>