This updates graphics/jpeg to v7 and cleans up DESCR. I have a bulk build running to catch any unexpected fallout. Meanwhile people may want to look over the port itself.
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/jpeg/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- Makefile 10 Jun 2009 09:39:50 -0000 1.34 +++ Makefile 13 Oct 2009 11:58:00 -0000 @@ -2,30 +2,34 @@ COMMENT= IJG's JPEG compression utilities -DISTNAME= jpegsrc.v6b -PKGNAME= jpeg-6bp5 -SHARED_LIBS= jpeg 62.0 +DISTNAME= jpegsrc.v7 +PKGNAME= jpeg-7 +SHARED_LIBS= jpeg 63.0 # .7.0 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/ +MASTER_SITES= ${HOMEPAGE}files/ HOMEPAGE= http://www.ijg.org/ +# BSD-style PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c +WANTLIB= c + +SEPARATE_BUILD= simple USE_LIBTOOL= Yes -CONFIGURE_STYLE= gnu dest -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static +CONFIGURE_STYLE=gnu +CONFIGURE_ARGS= ${CONFIGURE_SHARED} --disable-silent-rules +MAKE_ENV= RM="rm -f" -WRKDIST= ${WRKDIR}/jpeg-6b +WRKDIST= ${WRKDIR}/jpeg-7 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jpeg - ${INSTALL_DATA} ${WRKDIST}/libjpeg.doc ${PREFIX}/share/doc/jpeg + ${INSTALL_DATA} ${WRKSRC}/libjpeg.txt ${WRKSRC}/wizard.txt \ + ${PREFIX}/share/doc/jpeg ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jpeg - ${INSTALL_DATA} ${WRKDIST}/example.c ${PREFIX}/share/examples/jpeg + ${INSTALL_DATA} ${WRKSRC}/example.c ${PREFIX}/share/examples/jpeg .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/jpeg/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 16:19:56 -0000 1.3 +++ distinfo 13 Oct 2009 11:58:00 -0000 @@ -1,5 +1,5 @@ -MD5 (jpegsrc.v6b.tar.gz) = 29XztH7RMTLwTGhdYIp1Rw== -RMD160 (jpegsrc.v6b.tar.gz) = GIkiBgFPu4yuKkTigfTtU/6veII= -SHA1 (jpegsrc.v6b.tar.gz) = cHnw1sQvrQz7o4LPatMirdGs6Pk= -SHA256 (jpegsrc.v6b.tar.gz) = dcPsJB6ZllBP4Cqe1NEvFrdK3nE5cvPbnmXOlc0n410= -SIZE (jpegsrc.v6b.tar.gz) = 613261 +MD5 (jpegsrc.v7.tar.gz) = OC7zOzOcKZtWuvEpbNqXhQ== +RMD160 (jpegsrc.v7.tar.gz) = YEnF/uJoLAdX1LUXQKvZgdGyRIc= +SHA1 (jpegsrc.v7.tar.gz) = iMztD8Pb28ghFeHQirzk6dI6S0c= +SHA256 (jpegsrc.v7.tar.gz) = ULeGYgbFvgRMSisNeJWJj1pY0xtQ4W55z33qO5Azfr8= +SIZE (jpegsrc.v7.tar.gz) = 960379 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 20 Feb 2001 22:21:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2001/02/20 22:21:08 danh Exp $ ---- configure.orig Sat Mar 21 14:08:57 1998 -+++ configure Tue Feb 20 16:54:24 2001 -@@ -1675,11 +1675,8 @@ else - COM_LT="# " - fi - --if test "x$LTSHARED" != xno; then -- FORCE_INSTALL_LIB="install-lib" --else -- FORCE_INSTALL_LIB="" --fi -+# always install the libs -+FORCE_INSTALL_LIB="install-lib" - - # Set up -I directives - if test "x$srcdir" = x.; then Index: patches/patch-jerror_c =================================================================== RCS file: /cvs/ports/graphics/jpeg/patches/patch-jerror_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-jerror_c --- patches/patch-jerror_c 3 Apr 2005 23:26:22 -0000 1.1 +++ patches/patch-jerror_c 13 Oct 2009 11:58:00 -0000 @@ -1,16 +1,12 @@ -$OpenBSD: patch-jerror_c,v 1.1 2005/04/03 23:26:22 brad Exp $ +$OpenBSD$ -This one is slightly problematic, if an application -choose to allocate more room for its error buffer than -the recommanded JMSG_LENGTH_MAX the error message will -get truncated. +This one is slightly problematic. If an application allocates less +room for its error buffer than the recommended JMSG_LENGTH_MAX, the +error message buffer will still overflow. -There should be no loss of functionnality and I'm not -aware of any app doing that. - ---- jerror.c.orig Sun Feb 22 02:03:15 1998 -+++ jerror.c Sun Mar 27 04:01:51 2005 -@@ -190,9 +190,9 @@ format_message (j_common_ptr cinfo, char +--- jerror.c.orig Sat Oct 10 12:43:21 2009 ++++ jerror.c Sat Oct 10 12:43:52 2009 +@@ -190,9 +190,9 @@ format_message (j_common_ptr cinfo, char * buffer) /* Format the message into the passed buffer */ if (isstring) Index: patches/patch-makefile_cfg =================================================================== RCS file: patches/patch-makefile_cfg diff -N patches/patch-makefile_cfg --- patches/patch-makefile_cfg 27 Dec 2005 16:06:52 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-makefile_cfg,v 1.1 2005/12/27 16:06:52 steven Exp $ ---- makefile.cfg.orig Mon Dec 26 23:43:20 2005 -+++ makefile.cfg Mon Dec 26 23:43:43 2005 -@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS) - # with libtool: - libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS) - $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ -- -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) -+ -rpath $(libdir) $(libjpeg_la_LDFLAGS) - - # sample programs: - Index: patches/patch-wrjpgcom_c =================================================================== RCS file: patches/patch-wrjpgcom_c diff -N patches/patch-wrjpgcom_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-wrjpgcom_c 13 Oct 2009 11:58:00 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- wrjpgcom.c.orig Sat Oct 10 12:35:12 2009 ++++ wrjpgcom.c Sat Oct 10 12:36:11 2009 +@@ -453,7 +453,7 @@ main (int argc, char **argv) + comment_arg = (char *) malloc((size_t) MAX_COM_LENGTH); + if (comment_arg == NULL) + ERREXIT("Insufficient memory"); +- strcpy(comment_arg, argv[argn]+1); ++ strlcpy(comment_arg, argv[argn]+1, MAX_COM_LENGTH); + for (;;) { + comment_length = (unsigned int) strlen(comment_arg); + if (comment_length > 0 && comment_arg[comment_length-1] == '"') { +@@ -462,8 +462,8 @@ main (int argc, char **argv) + } + if (++argn >= argc) + ERREXIT("Missing ending quote mark"); +- strcat(comment_arg, " "); +- strcat(comment_arg, argv[argn]); ++ strlcat(comment_arg, " ", MAX_COM_LENGTH); ++ strlcat(comment_arg, argv[argn], MAX_COM_LENGTH); + } + } + comment_length = (unsigned int) strlen(comment_arg); Index: patches/patch-wrrle_c =================================================================== RCS file: patches/patch-wrrle_c diff -N patches/patch-wrrle_c --- patches/patch-wrrle_c 3 Apr 2005 23:26:22 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-wrrle_c,v 1.1 2005/04/03 23:26:22 brad Exp $ - -cmapcomment is a local array, we can use sizeof. - ---- wrrle.c.orig Sun Mar 27 03:48:15 2005 -+++ wrrle.c Sun Mar 27 03:49:32 2005 -@@ -199,7 +199,8 @@ finish_output_rle (j_decompress_ptr cinf - header.cmaplen = CMAPBITS; - header.cmap = dest->colormap; - /* Add a comment to the output image with the true colormap length. */ -- sprintf(cmapcomment, "color_map_length=%d", cinfo->actual_number_of_colors); -+ snprintf(cmapcomment, sizeof cmapcomment, -+ "color_map_length=%d", cinfo->actual_number_of_colors); - rle_putcom(cmapcomment, &header); - } - Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/graphics/jpeg/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 DESCR --- pkg/DESCR 3 Dec 1997 02:30:52 -0000 1.1.1.1 +++ pkg/DESCR 13 Oct 2009 11:58:00 -0000 @@ -1,20 +1,13 @@ -The Independent JPEG Group's JPEG software -========================================== +This package contains software to implement JPEG image encoding, decoding, +and transcoding. JPEG (pronounced "jay-peg") is a standardized compression +method for full-color and gray-scale images. -README for release 6 of 2-Aug-95 -================================ +This software implements JPEG baseline, extended-sequential, and progressive +compression processes. -This distribution contains the sixth public release of the Independent JPEG -Group's free JPEG software. You are welcome to redistribute this software and -to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. - -Serious users of this software (particularly those incorporating it into -larger programs) should contact IJG at jpeg-i...@uunet.uu.net to be added to -our electronic mailing list. Mailing list members are notified of updates -and have a chance to participate in technical discussions, etc. - -This software is the work of Tom Lane, Philip Gladstone, Luis Ortiz, Jim -Boucher, Lee Crocker, Julian Minguillon, George Phillips, Davide Rossi, -Ge' Weijers, and other members of the Independent JPEG Group. - -IJG is not affiliated with the official ISO JPEG standards committee. +A set of library routines for reading and writing JPEG image files is provided, +plus two sample applications "cjpeg" and "djpeg", which use the library to +perform conversion between JPEG and some other popular image file formats. +Also included is "jpegtran", a utility for lossless transcoding between +different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple +applications for inserting and extracting textual comments in JFIF files. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/jpeg/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 8 Apr 2009 11:46:10 -0000 1.10 +++ pkg/PLIST 13 Oct 2009 11:58:00 -0000 @@ -1,4 +1,9 @@ @comment $OpenBSD: PLIST,v 1.10 2009/04/08 11:46:10 eric Exp $ +...@bin bin/cjpeg +...@bin bin/djpeg +...@bin bin/jpegtran +...@bin bin/rdjpgcom +...@bin bin/wrjpgcom include/jconfig.h include/jerror.h include/jmorecfg.h @@ -6,18 +11,13 @@ include/jpeglib.h lib/libjpeg.a lib/libjpeg.la %%SHARED%% -...@endfake -...@bin bin/cjpeg -...@bin bin/djpeg -...@bin bin/jpegtran -...@bin bin/rdjpgcom -...@bin bin/wrjpgcom @man man/man1/cjpeg.1 @man man/man1/djpeg.1 @man man/man1/jpegtran.1 @man man/man1/rdjpgcom.1 @man man/man1/wrjpgcom.1 share/doc/jpeg/ -share/doc/jpeg/libjpeg.doc +share/doc/jpeg/libjpeg.txt +share/doc/jpeg/wizard.txt share/examples/jpeg/ share/examples/jpeg/example.c -- Christian "naddy" Weisgerber na...@uugrn.org
