diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 765466a42148..83505a1dea53 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,103 +1,102 @@ PORTNAME= netpbm -DISTVERSION= 11.03.06 +DISTVERSION= 11.04.02 CATEGORIES= graphics MASTER_SITES= LOCAL/leres/netpbm MAINTAINER= leres@FreeBSD.org COMMENT= Toolkit for conversion of images between different formats WWW= https://netpbm.sourceforge.net/ LICENSE= GPLv2 IJG LGPL21 MIT PD LICENSE_COMB= multi LICENSE_NAME_IJG= Independent JPEG Group License LICENSE_FILE_IJG= ${WRKSRC}/doc/copyright_summary LICENSE_PERMS_IJG= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libjasper.so:graphics/jasper \ libjbig.so:graphics/jbigkit \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= cpe gmake jpeg perl5 shebangfix tar:xz USE_LDCONFIG= yes CPE_VENDOR= netpbm_project -SVN_REV= r4687 +SVN_REV= r4709 SHEBANG_FILES= buildtools/makeman converter/pbm/pbmtox10bm \ editor/pnmflip editor/pnmquant editor/ppmfade \ editor/ppmquant editor/ppmshadow generator/ppmrainbow \ test/*.test test/Available-Testprog test/Execute-Tests MAKEFILE= GNUmakefile MAKE_ARGS= BINMODE=${BINMODE} \ CC=${CC} \ DATADIR=${DATADIR} \ DATAMODE=${_SHAREMODE} \ DIRMODE=755 \ MANMODE=${MANMODE} \ pkgdir=${STAGEDIR}${PREFIX} \ SHAREMODE=${SHAREMODE} INSTALL_TARGET= install.bin install.lib install.data install.hdr OPTIONS_DEFINE= SVGTOPAM X11 OPTIONS_SUB= yes SVGTOPAM_DESC= Build svgtopam X11_DESC= Build pamx SVGTOPAM_USES= gnome SVGTOPAM_USE= gnome=libxml2 X11_USES= xorg X11_USE= xorg=x11,xau,xcb,xdmcp post-patch: ${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk - ${REINPLACE_CMD} -e 's|pkg-config|false|g' ${WRKSRC}/GNUmakefile .ifdef WITH_PIE .for dn in buildtools test ${REINPLACE_CMD} -e '/^all:/s/^/CFLAGS_FOR_BUILD+=${PIE_CFLAGS}\n/' \ ${WRKSRC}/${dn}/Makefile .endfor .endif # # To roll snapshot: make BOOTSTRAP= makesum # #.if defined(BOOTSTRAP) && !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) .if defined(BOOTSTRAP) FETCH_DEPENDS+= svn:devel/subversion WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work/.bootstrap do-fetch: ${RM} -rf ${WRKDIR} ${MKDIR} ${WRKDIR} svn export -r${SVN_REV} \ https://svn.code.sf.net/p/${PORTNAME}/code/advanced ${WRKSRC} ${TAR} -jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C${WRKDIR} \ ${DISTNAME} ${RM} -rf ${WRKDIR} .endif # Disable building svgtopam by default. It is the only program that # requires libxml2 and it is not useful in this day and age according # to the author. See the top of converter/other/svgtopam.c for more # details. post-patch-SVGTOPAM-off: ${REINPLACE_CMD} '/svgtopam/d' ${WRKSRC}/converter/other/Makefile post-patch-X11-off: ${REINPLACE_CMD} '/pamx/d' ${WRKSRC}/other/Makefile do-configure: ${CAT} ${WRKSRC}/config.mk.in ${FILESDIR}/config.mk > \ ${WRKSRC}/config.mk post-install: cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetpbm.so.11 libnetpbm.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnetpbm.so ${RM} ${STAGEDIR}${PREFIX}/bin/manweb ${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${WRKSRC}/pm_config.h \ ${STAGEDIR}${PREFIX}/include/netpbm ${RMDIR} ${STAGEDIR}${PREFIX}/sharedlink .include diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 94ca4e99673f..a0c19222859e 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695684831 -SHA256 (netpbm-11.03.06.tar.xz) = 1c1adfc1f6168942f6ab8df66db5954f2eaa2f052192414e2a4a99080121a3f9 -SIZE (netpbm-11.03.06.tar.xz) = 2428526 +TIMESTAMP = 1696025133 +SHA256 (netpbm-11.04.02.tar.xz) = c7af684a300a20285e67f8900537828681994e74f5870155f84bfb9daa75e99e +SIZE (netpbm-11.04.02.tar.xz) = 2432352 diff --git a/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c b/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c deleted file mode 100644 index 1d2fc2aa7672..000000000000 --- a/graphics/netpbm/files/patch-converter_ppm_ppmtompeg_psocket.c +++ /dev/null @@ -1,23 +0,0 @@ -psocket.c:123:15: warning: implicit declaration of function 'ntohl' is invalid in C99 [-Wimplicit-function-declaration] - *valueP = ntohl(converter.value); - ^ -psocket.c:196:23: warning: implicit declaration of function 'htonl' is invalid in C99 [-Wimplicit-function-declaration] - converter.value = htonl(value); - ^ -psocket.c:295:34: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration] - nameEntry.sin_port = htons(tempShort); - ^ -psocket.c:358:32: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration] - nameEntry.sin_port = htons(trialPortNum); - ^ - ---- converter/ppm/ppmtompeg/psocket.c.orig 2020-03-27 19:26:06 UTC -+++ converter/ppm/ppmtompeg/psocket.c -@@ -9,7 +9,6 @@ - - ============================================================================*/ - --#define _XOPEN_SOURCE 500 /* Make sure stdio.h contains pclose() */ - /* _ALL_SOURCE is needed on AIX to make the C library include the - socket services (e.g. define struct sockaddr) - diff --git a/graphics/netpbm/files/patch-jasper b/graphics/netpbm/files/patch-jasper deleted file mode 100644 index 2151239155d8..000000000000 --- a/graphics/netpbm/files/patch-jasper +++ /dev/null @@ -1,22 +0,0 @@ ---- converter/other/jpeg2000/jpeg2ktopam.c.orig 2020-07-22 20:35:17 UTC -+++ converter/other/jpeg2000/jpeg2ktopam.c -@@ -17,6 +17,8 @@ - but plenty of source files of libjasper do to0, and they did not have - _XOPEN_SOURCE 600, so it would seem to be superfluous here too. - */ -+#include -+typedef __max_align_t max_align_t; - #include - - #include ---- converter/other/jpeg2000/pamtojpeg2k.c.orig 2020-07-22 20:35:17 UTC -+++ converter/other/jpeg2000/pamtojpeg2k.c -@@ -18,6 +18,8 @@ - _XOPEN_SOURCE 600, so it would seem to be superfluous here too. - */ - -+#include -+typedef __max_align_t max_align_t; - #include - - #include diff --git a/graphics/netpbm/files/patch-lib_libpm.c b/graphics/netpbm/files/patch-lib_libpm.c deleted file mode 100644 index d300bd6ae26b..000000000000 --- a/graphics/netpbm/files/patch-lib_libpm.c +++ /dev/null @@ -1,33 +0,0 @@ -libpm.c:836:12: warning: implicit declaration of function 'arc4random' is invalid in C99 - [-Wimplicit-function-declaration] - return arc4random(); - ^ - ---- lib/libpm.c.orig 2020-03-27 19:09:35 UTC -+++ lib/libpm.c -@@ -9,7 +9,7 @@ - **************************************************************************/ - - #define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ --#define _XOPEN_SOURCE 500 /* Make sure ftello, fseeko are defined */ -+#define _BSD_SOURCE 1 - - #include "netpbm/pm_config.h" - -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -832,7 +833,7 @@ pm_arg0toprogname(const char arg0[]) { - unsigned int - pm_randseed(void) { - -- return time(NULL) ^ getpid(); -+ return arc4random(); - - } - diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist index b4f8ab5ba805..c193643bada3 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -1,413 +1,413 @@ bin/411toppm bin/anytopnm bin/asciitopgm bin/atktopbm bin/avstopam bin/bioradtopgm bin/bmptopnm bin/bmptoppm bin/brushtopbm bin/cameratopam bin/cistopbm bin/cmuwmtopbm bin/ddbugtopbm bin/escp2topbm bin/eyuvtoppm bin/fiascotopnm bin/fitstopnm %%SVGTOPAM%%bin/svgtopam bin/fstopgm bin/g3topbm bin/gemtopbm bin/gemtopnm bin/giftopnm bin/gouldtoppm bin/hdifftopam bin/hipstopgm bin/hpcdtoppm bin/icontopbm bin/ilbmtoppm bin/imgtoppm bin/infotopam bin/jbigtopnm bin/jpeg2ktopam bin/jpegtopnm bin/leaftoppm bin/lispmtopgm bin/macptopbm bin/mdatopbm bin/mgrtopbm bin/mrftopbm bin/mtvtoppm bin/neotoppm bin/palmtopnm bin/pamaddnoise bin/pamaltsat bin/pamarith bin/pambackground bin/pambayer bin/pambrighten bin/pamcat bin/pamchannel bin/pamcomp bin/pamcrater bin/pamcut bin/pamdeinterlace bin/pamdepth bin/pamdice bin/pamditherbw bin/pamedge bin/pamendian bin/pamenlarge bin/pamexec bin/pamfile bin/pamfind bin/pamfix bin/pamfixtrunc bin/pamflip bin/pamfunc bin/pamgauss bin/pamgetcolor bin/pamgradient bin/pamhomography bin/pamhue bin/pamlevels bin/pamlookup bin/pammasksharpen bin/pammixinterlace bin/pammixmulti bin/pammosaicknit bin/pamoil bin/pampaintspill bin/pamperspective bin/pampick bin/pampop9 bin/pamrecolor bin/pamrestack bin/pamrgbatopng bin/pamrubber bin/pamscale bin/pamseq bin/pamshadedrelief bin/pamsharpmap bin/pamsharpness bin/pamshuffle bin/pamsistoaglyph bin/pamslice bin/pamsplit bin/pamstack bin/pamstereogram bin/pamstretch bin/pamstretch-gen bin/pamsumm bin/pamsummcol bin/pamtable bin/pamthreshold bin/pamtilt bin/pamtoavs bin/pamtodjvurle bin/pamtofits bin/pamtogif bin/pamtohdiff bin/pamtohtmltbl bin/pamtojpeg2k bin/pamtompfont bin/pamtooctaveimg bin/pamtopam bin/pamtopdbimg bin/pamtopfm bin/pamtopng bin/pamtopnm bin/pamtoqoi bin/pamtosrf bin/pamtosvg bin/pamtotga bin/pamtotiff bin/pamtouil bin/pamtowinicon bin/pamtoxvmini bin/pamtris bin/pamundice bin/pamunlookup bin/pamvalidate bin/pamwipeout %%X11%%bin/pamx bin/pbmclean bin/pbmlife bin/pbmmake bin/pbmmask bin/pbmminkowski bin/pbmnoise bin/pbmpage bin/pbmpscale bin/pbmreduce bin/pbmtext bin/pbmtextps bin/pbmto10x bin/pbmto4425 bin/pbmtoascii bin/pbmtoatk bin/pbmtobbnbg bin/pbmtocis bin/pbmtocmuwm bin/pbmtodjvurle bin/pbmtoepsi bin/pbmtoepson bin/pbmtoescp2 bin/pbmtog3 bin/pbmtogem bin/pbmtogo bin/pbmtoibm23xx bin/pbmtoicon bin/pbmtolj bin/pbmtoln03 bin/pbmtolps bin/pbmtomacp bin/pbmtomatrixorbital bin/pbmtomda bin/pbmtomgr bin/pbmtomrf bin/pbmtonokia bin/pbmtopgm bin/pbmtopi3 bin/pbmtopk bin/pbmtoplot bin/pbmtoppa bin/pbmtopsg3 bin/pbmtoptx bin/pbmtosunicon bin/pbmtowbmp bin/pbmtox10bm bin/pbmtoxbm bin/pbmtoybm bin/pbmtozinc bin/pbmupc bin/pc1toppm bin/pcdindex bin/pcdovtoppm bin/pcxtoppm bin/pdbimgtopam bin/pfmtopam bin/pgmabel bin/pgmbentley bin/pgmcrater bin/pgmdeshadow bin/pgmedge bin/pgmenhance bin/pgmhist bin/pgmkernel bin/pgmmake bin/pgmmedian bin/pgmminkowski bin/pgmmorphconv bin/pgmnoise bin/pgmnorm bin/pgmoil bin/pgmramp bin/pgmslice bin/pgmtexture bin/pgmtofs bin/pgmtolispm bin/pgmtopbm bin/pgmtopgm bin/pgmtoppm bin/pgmtosbig bin/pgmtost4 bin/pi1toppm bin/pi3topbm bin/picttoppm bin/pjtoppm bin/pktopbm bin/pngtopam bin/pngtopnm bin/pnmalias bin/pnmarith bin/pnmcat bin/pnmcolormap bin/pnmcomp bin/pnmconvol bin/pnmcrop bin/pnmcut bin/pnmdepth bin/pnmenlarge bin/pnmfile bin/pnmflip bin/pnmgamma bin/pnmhisteq bin/pnmhistmap bin/pnmindex bin/pnminterp bin/pnminterp-gen bin/pnminvert bin/pnmmargin bin/pnmmercator bin/pnmmontage bin/pnmnlfilt bin/pnmnoraw bin/pnmnorm bin/pnmpad bin/pnmpaste bin/pnmpsnr bin/pnmquant bin/pnmquantall bin/pnmremap bin/pnmrotate bin/pnmscale bin/pnmscalefixed bin/pnmshear bin/pnmsmooth bin/pnmsplit bin/pnmstitch bin/pnmtile bin/pnmtoddif bin/pnmtofiasco bin/pnmtofits bin/pnmtojbig bin/pnmtojpeg bin/pnmtopalm bin/pnmtopclxl bin/pnmtoplainpnm bin/pnmtopng bin/pnmtopnm bin/pnmtops bin/pnmtorast bin/pnmtorle bin/pnmtosgi bin/pnmtosir bin/pnmtotiff bin/pnmtotiffcmyk bin/pnmtoxwd bin/ppm3d bin/ppmbrighten bin/ppmchange bin/ppmcie bin/ppmcolormask bin/ppmcolors bin/ppmdcfont bin/ppmddumpfont bin/ppmdim bin/ppmdist bin/ppmdither bin/ppmdmkfont bin/ppmdraw bin/ppmfade bin/ppmflash bin/ppmforge bin/ppmglobe bin/ppmhist bin/ppmlabel bin/ppmmake bin/ppmmix bin/ppmnorm bin/ppmntsc bin/ppmpat bin/ppmquant bin/ppmquantall bin/ppmrainbow bin/ppmrelief bin/ppmrough bin/ppmshadow bin/ppmshift bin/ppmspread bin/ppmtoacad bin/ppmtoapplevol bin/ppmtoarbtxt bin/ppmtoascii bin/ppmtobmp bin/ppmtoeyuv bin/ppmtogif bin/ppmtoicr bin/ppmtoilbm bin/ppmtojpeg bin/ppmtoleaf bin/ppmtolj bin/ppmtomap bin/ppmtomitsu bin/ppmtompeg bin/ppmtoneo bin/ppmtopcx bin/ppmtopgm bin/ppmtopi1 bin/ppmtopict bin/ppmtopj bin/ppmtopjxl bin/ppmtoppm bin/ppmtopuzz bin/ppmtorgb3 bin/ppmtosixel bin/ppmtospu bin/ppmtoterm bin/ppmtotga bin/ppmtouil bin/ppmtowinicon bin/ppmtoxpm bin/ppmtoyuv bin/ppmtoyuvsplit bin/ppmtv bin/ppmwheel bin/psidtopgm bin/pstopnm bin/qoitopam bin/qrttoppm bin/rasttopnm bin/rawtopgm bin/rawtoppm bin/rgb3toppm bin/rlatopam bin/rletopnm bin/sbigtopgm bin/sgitopnm bin/sirtopnm bin/sldtoppm bin/spctoppm bin/spottopgm bin/sputoppm bin/srftopam bin/st4topgm bin/sunicontopnm bin/tgatoppm bin/thinkjettopbm bin/tifftopnm bin/wbmptopbm bin/winicontopam bin/winicontoppm bin/xbmtopbm bin/ximtoppm bin/xpmtoppm bin/xvminitoppm bin/xwdtopnm bin/ybmtopbm bin/yuvsplittoppm bin/yuvtoppm bin/yuy2topam bin/zeisstopnm include/netpbm/colorname.h include/netpbm/mallocvar.h include/netpbm/pam.h include/netpbm/pamdraw.h include/netpbm/pammap.h include/netpbm/pbm.h include/netpbm/pbmfont.h include/netpbm/pbmfontdata.h include/netpbm/pgm.h include/netpbm/pm.h include/netpbm/pm_c_util.h include/netpbm/pm_config.h include/netpbm/pm_gamma.h include/netpbm/pm_system.h include/netpbm/pnm.h include/netpbm/ppm.h include/netpbm/ppmcmap.h include/netpbm/ppmdfont.h include/netpbm/ppmdraw.h include/netpbm/runlength.h include/netpbm/shhopt.h lib/libnetpbm.so lib/libnetpbm.so.11 -lib/libnetpbm.so.11.103 +lib/libnetpbm.so.11.104 %%DATADIR%%/palmcolor8.map %%DATADIR%%/palmgray1.map %%DATADIR%%/palmgray2.map %%DATADIR%%/palmgray4.map %%DATADIR%%/pcxstd.ppm %%DATADIR%%/rgb.txt