ports/109658: graphics/vips: attempt to unbreak
Eric P. Scott
eps+pbug0702 at ana.com
Wed Feb 28 05:00:11 UTC 2007
>Number: 109658
>Category: ports
>Synopsis: graphics/vips: attempt to unbreak
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 28 05:00:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Eric P. Scott
>Release: FreeBSD 6.2-RELEASE i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD sixofone 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007 root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
1. Add explicit build dependencies on PERL5 and p5-XML-Parser
2. Change INSTALLS_SHLIB to USE_LDCONFIG
3. Address problem described in PR ports/108106
4. Eliminate causes of numerous compilation warnings
5. Use DATADIR substitutions in pkg-plist
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/graphics/vips/Makefile graphics/vips/Makefile
--- /usr/ports/graphics/vips/Makefile Sat Feb 10 17:23:29 2007
+++ graphics/vips/Makefile
@@ -14,21 +14,19 @@
MAINTAINER= lev at FreeBSD.org
COMMENT= Free image processing system
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
LIB_DEPENDS= fftw3.4:${PORTSDIR}/math/fftw3 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
png.5:${PORTSDIR}/graphics/png \
lcms.1:${PORTSDIR}/graphics/lcms
-BROKEN= Missing dependency
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2007-04-10
-
USE_GMAKE= yes
USE_GETTEXT= yes
+USE_PERL5_BUILD= yes
USE_GNOME= gnomehack glib20 pkgconfig pango
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-magick --without-x
diff -ruN /usr/ports/graphics/vips/files/patch-configure graphics/vips/files/patch-configure
--- /usr/ports/graphics/vips/files/patch-configure Wed Dec 31 16:00:00 1969
+++ graphics/vips/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Wed Aug 23 05:33:19 2006
++++ configure
+@@ -5250,7 +5250,7 @@
+ #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+ _ACEOF
+
+-ALL_LINGUAS="en_GB malkovich"
++ALL_LINGUAS="en_GB"
+
+ case "$am__api_version" in
+ 1.01234)
diff -ruN /usr/ports/graphics/vips/files/patch-contrib-vdump-vdump.c graphics/vips/files/patch-contrib-vdump-vdump.c
--- /usr/ports/graphics/vips/files/patch-contrib-vdump-vdump.c Wed Dec 31 16:00:00 1969
+++ graphics/vips/files/patch-contrib-vdump-vdump.c
@@ -0,0 +1,14 @@
+--- contrib/vdump/vdump.c.orig Tue Feb 8 07:19:19 2005
++++ contrib/vdump/vdump.c
+@@ -309,9 +309,9 @@
+ /* Print body of file.
+ */
+ if( im->Bands == 3 )
+- encode_colour( im, scale, im->data );
++ encode_colour( im, scale, (struct pixel *) im->data );
+ else
+- encode_mono( im, scale, im->data );
++ encode_mono( im, scale, (struct mpixel *) im->data );
+
+ /* Print trailer.
+ */
diff -ruN /usr/ports/graphics/vips/files/patch-libsrc-conversion-im_tiff2vips.c graphics/vips/files/patch-libsrc-conversion-im_tiff2vips.c
--- /usr/ports/graphics/vips/files/patch-libsrc-conversion-im_tiff2vips.c Wed Dec 31 16:00:00 1969
+++ graphics/vips/files/patch-libsrc-conversion-im_tiff2vips.c
@@ -0,0 +1,15 @@
+--- libsrc/conversion/im_tiff2vips.c.orig Wed Aug 17 06:34:12 2005
++++ libsrc/conversion/im_tiff2vips.c
+@@ -157,6 +157,12 @@
+ #include <vips/vips.h>
+ #include <vips/thread.h>
+
++#undef D50_X0
++#undef D50_Y0
++#undef D50_Z0
++#undef D65_X0
++#undef D65_Y0
++#undef D65_Z0
+ #include <tiffio.h>
+
+ #ifdef WITH_DMALLOC
diff -ruN /usr/ports/graphics/vips/files/patch-libsrc-conversion-im_vips2tiff.c graphics/vips/files/patch-libsrc-conversion-im_vips2tiff.c
--- /usr/ports/graphics/vips/files/patch-libsrc-conversion-im_vips2tiff.c Wed Dec 31 16:00:00 1969
+++ graphics/vips/files/patch-libsrc-conversion-im_vips2tiff.c
@@ -0,0 +1,15 @@
+--- libsrc/conversion/im_vips2tiff.c.orig Fri Mar 3 03:06:32 2006
++++ libsrc/conversion/im_vips2tiff.c
+@@ -145,6 +145,12 @@
+
+ #include <vips/vips.h>
+
++#undef D50_X0
++#undef D50_Y0
++#undef D50_Z0
++#undef D65_X0
++#undef D65_Y0
++#undef D65_Z0
+ #include <tiffio.h>
+
+ #ifdef WITH_DMALLOC
diff -ruN /usr/ports/graphics/vips/files/patch-libsrc-iofuncs-predicate.c graphics/vips/files/patch-libsrc-iofuncs-predicate.c
--- /usr/ports/graphics/vips/files/patch-libsrc-iofuncs-predicate.c Wed Dec 31 16:00:00 1969
+++ graphics/vips/files/patch-libsrc-iofuncs-predicate.c
@@ -0,0 +1,15 @@
+--- libsrc/iofuncs/predicate.c.orig Tue Feb 8 07:19:20 2005
++++ libsrc/iofuncs/predicate.c
+@@ -73,6 +73,12 @@
+ #include <vips/vips.h>
+
+ #ifdef HAVE_TIFF
++#undef D50_X0
++#undef D50_Y0
++#undef D50_Z0
++#undef D65_X0
++#undef D65_Y0
++#undef D65_Z0
+ #include <tiffio.h>
+ #endif /*HAVE_TIFF*/
+
diff -ruN /usr/ports/graphics/vips/pkg-plist graphics/vips/pkg-plist
--- /usr/ports/graphics/vips/pkg-plist Thu Dec 14 07:00:39 2006
+++ graphics/vips/pkg-plist
@@ -1104,26 +1104,25 @@
%%PORTDOCS%%%%DOCSDIR%%/ps/libguide.ps
%%PORTDOCS%%%%DOCSDIR%%/ps/refguide.ps
share/locale/en_GB/LC_MESSAGES/vips7.mo
-share/locale/malkovich/LC_MESSAGES/vips7.mo
-share/vips/vdump.pro
-share/vips/vips2dj/cmyk/head1
-share/vips/vips2dj/cmyk/head2
-share/vips/vips2dj/cmyk/head3
-share/vips/vips2dj/cmyk/head4
-share/vips/vips2dj/cmyk/head5
-share/vips/vips2dj/cmyk/head6
-share/vips/vips2dj/lab/head1
-share/vips/vips2dj/lab/head2
-share/vips/vips2dj/lab/head3
-share/vips/vips2dj/lab/head4
-share/vips/vips2dj/lab/head5
-share/vips/vips2dj/lab/head6
-share/vips/vips2dj/mono/head1
-share/vips/vips2dj/mono/head2
-share/vips/vips2dj/mono/head3
-share/vips/vips2dj/mono/head4
-share/vips/vips2dj/mono/head5
-share/vips/vips2dj/mono/head6
+%%DATADIR%%/vdump.pro
+%%DATADIR%%/vips2dj/cmyk/head1
+%%DATADIR%%/vips2dj/cmyk/head2
+%%DATADIR%%/vips2dj/cmyk/head3
+%%DATADIR%%/vips2dj/cmyk/head4
+%%DATADIR%%/vips2dj/cmyk/head5
+%%DATADIR%%/vips2dj/cmyk/head6
+%%DATADIR%%/vips2dj/lab/head1
+%%DATADIR%%/vips2dj/lab/head2
+%%DATADIR%%/vips2dj/lab/head3
+%%DATADIR%%/vips2dj/lab/head4
+%%DATADIR%%/vips2dj/lab/head5
+%%DATADIR%%/vips2dj/lab/head6
+%%DATADIR%%/vips2dj/mono/head1
+%%DATADIR%%/vips2dj/mono/head2
+%%DATADIR%%/vips2dj/mono/head3
+%%DATADIR%%/vips2dj/mono/head4
+%%DATADIR%%/vips2dj/mono/head5
+%%DATADIR%%/vips2dj/mono/head6
@dirrm include/vips
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/appguide
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/cppguide
@@ -1133,8 +1132,8 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/vips/vips2dj/cmyk
- at dirrm share/vips/vips2dj/lab
- at dirrm share/vips/vips2dj/mono
- at dirrm share/vips/vips2dj
- at dirrm share/vips
+ at dirrm %%DATADIR%%/vips2dj/cmyk
+ at dirrm %%DATADIR%%/vips2dj/lab
+ at dirrm %%DATADIR%%/vips2dj/mono
+ at dirrm %%DATADIR%%/vips2dj
+ at dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list