From: David Wolfskill on
On my laptop, running FreeBSD/i386 7.3-STABLE:

FreeBSD 7.3-STABLE #132 r210110: Thu Jul 15 05:01:26 PDT 2010 root(a)g1-216.catwhisker.org:/common/S2/obj/usr/src/sys/CANARY

My attempt this morning to upgrade xpaint-2.7.8.1_4 to xpaint-2.9.1.4
fails.

After the first such failure, I used portmaster to re-install
freetype2-2.3.12, which seems to have gone well; here's a typescript of
what happened after that:

Script started on Fri Jul 16 11:00:38 2010
d254(7.3-S)[1] portmaster freetype2-2.3.12
]0;portmaster: freetype2-2.3.12
===>>> Currently installed version: freetype2-2.3.12
===>>> Port directory: /usr/ports/print/freetype2
...
install -o root -g wheel -m 555 -m 644 ./builds/unix/freetype2.pc \
/usr/local/libdata/pkgconfig/freetype2.pc
===> Running ldconfig
/sbin/ldconfig -m /usr/local/lib
===> Registering installation for freetype2-2.3.12

===> Cleaning for freetype2-2.3.12

===>>> Updating dependency entry for freetype2-2.3.12 in each dependent port

===>>> Re-installation of freetype2-2.3.12 complete

d254(7.3-S)[2] portmaster xpaint-2.7.8.1_4
]0;portmaster: xpaint-2.7.8.1_4
===>>> Currently installed version: xpaint-2.7.8.1_4
===>>> Port directory: /usr/ports/graphics/xpaint

===>>> Gathering distinfo list for installed ports

===>>> Launching 'make checksum' for graphics/xpaint in background
===>>> Gathering dependency list for graphics/xpaint from ports
===>>> Starting recursive 'make config' check
===>>> Recursive 'make config' check complete for graphics/xpaint
]0;portmaster: xpaint-2.7.8.1_4
===>>> Starting build for graphics/xpaint <<<===

===>>> All dependencies are up to date

===> Cleaning for xpaint-2.9.1.4

===> Vulnerability check disabled, database not found
===> License check disabled, port has not defined LICENSE
===> Extracting for xpaint-2.9.1.4
=> MD5 Checksum OK for xpaint-2.9.1.4.tar.bz2.
=> SHA256 Checksum OK for xpaint-2.9.1.4.tar.bz2.
===> Patching for xpaint-2.9.1.4
===> Applying FreeBSD patches for xpaint-2.9.1.4
===> xpaint-2.9.1.4 depends on executable: imake - found
===> xpaint-2.9.1.4 depends on file: /usr/local/libdata/pkgconfig/xft.pc - found
===> xpaint-2.9.1.4 depends on file: /usr/local/libdata/pkgconfig/xmu.pc - found
===> xpaint-2.9.1.4 depends on file: /usr/local/libdata/pkgconfig/xpm.pc - found
===> xpaint-2.9.1.4 depends on shared library: png.6grep: writing output: Broken pipe
grep: writing output: Broken pipe
[ ...138 of these ...]
grep: writing output: Broken pipe
- found
===> xpaint-2.9.1.4 depends on shared library: tiff.4grep: writing output: Broken pipe
grep: writing output: Broken pipe
[ ...138 of these ...]
grep: writing output: Broken pipe
- found
===> Configuring for xpaint-2.9.1.4
XAWLIB_DEFINES = -DXAW3D -DXAW3DG -DXAW3DXFT
SYS_LIBRARIES = xaw3dxft/libXaw3dxft.a -lXt -L.

imake -DUseInstalled -I/usr/local/lib/X11/config
sed -e 's/\/\* XPM support \*\//#undef XAW_MULTIPLANE_PIXMAPS/' -e 's/\/\* gray stipples \*\//#define XAW_GRAY_BLKWHT_STIPPLES/' -e 's/\/\* arrow scrollbars \*\//#define XAW_ARROW_SCROLLBARS/' Xaw3dP.h.sed > Xaw3dP.h
imake -DUseInstalled -I/usr/local/lib/X11/config
make Makefiles
making Makefiles in rw...
making Makefiles in xaw3dxft...
mv -f Makefile Makefile.bak
making Makefiles in bitmaps...
making Makefiles in Doc...
make includes
cc substads.c -o substads
cd app-defaults ; ../substads -appdefs XPAINT_VERSION 2.9.1 XPAINT_SHAREDIR /usr/local/share/xpaint XPAINT_PRINT_COMMAND "lpr" XPAINT_POSTSCRIPT_VIEWER "gv" XPAINT_EXTERN_VIEWER "display"
Converting XPaint_fr.ad.in -> out/XPaint_fr
Converting XPaint_es.ad.in -> out/XPaint_es
Converting XPaint.ad.in -> out/XPaint
cp -f app-defaults/out/XPaint XPaint.ad
./substads -ad2c XPaint.ad XPaint.ad.h
./substads -ad2c DefaultRC DefaultRC.txt.h
cd bitmaps; rm -f tools; if test "" != "" ; then ln -s big_tools tools ; else ln -s small_tools tools ; fi
make depend
rm -f .depend
gccmakedep -f- -I./bitmaps -- -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DERRORBEEP -DFEATURE_FRACTAL -DXAW3D -DXAW3DG -DXAW3DXFT -I/usr/local/include/X11 -I. `pkg-config --cflags xft` "-DEDITOR=\"emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black\"" "-DSHAREDIR=\"/usr/local/share/xpaint\"" "-DXAPPLOADDIR=\"/usr/local/lib/X11/app-defaults\"" "-DXPAINT_VERSION=\"2.9.1\"" "-DLPCCMD=\"/usr/sbin/lpc status\"" -DERRORBEEP -DFEATURE_FRACTAL -- chroma.c color.c colorEdit.c dialog.c fatBitsEdit.c fileBrowser.c fontSelect.c grab.c graphic.c hash.c help.c image.c imageComp.c iprocess.c magnifier.c main.c menu.c misc.c operation.c palette.c pattern.c print.c protocol.c readRC.c screenshot.c text.c texture.c typeConvert.c arcOp..c freehandOp.c boxOp.c brushOp.c circleOp.c fillOp.c fontOp.c lineOp.c pencilOp.c polygonOp.c splineOp.c selectOp.c sprayOp.c dynPenOp.c Colormap.c Paint.c PaintEvent.c PaintRegion.c PaintUndo.c > .depend
mv -f Makefile Makefile.bak
imake -DUseInstalled -I/usr/local/lib/X11/config
make Makefiles
making Makefiles in rw...
mv -f Makefile Makefile.bak
making Makefiles in xaw3dxft...
mv -f Makefile Makefile.bak
making Makefiles in bitmaps...
mv -f Makefile Makefile.bak
making Makefiles in Doc...
mv -f Makefile Makefile.bak
make includes
cd bitmaps; rm -f tools; if test "" != "" ; then ln -s big_tools tools ; else ln -s small_tools tools ; fi
make depend
rm -f .depend
gccmakedep -f- -I./bitmaps -- -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DERRORBEEP -DFEATURE_FRACTAL -DXAW3D -DXAW3DG -DXAW3DXFT -I/usr/local/include/X11 -I. `pkg-config --cflags xft` "-DEDITOR=\"emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black\"" "-DSHAREDIR=\"/usr/local/share/xpaint\"" "-DXAPPLOADDIR=\"/usr/local/lib/X11/app-defaults\"" "-DXPAINT_VERSION=\"2.9.1\"" "-DLPCCMD=\"/usr/sbin/lpc status\"" -DERRORBEEP -DFEATURE_FRACTAL -- chroma.c color.c colorEdit.c dialog.c fatBitsEdit.c fileBrowser.c fontSelect.c grab.c graphic.c hash.c help.c image.c imageComp.c iprocess.c magnifier.c main.c menu.c misc.c operation.c palette.c pattern.c print.c protocol.c readRC.c screenshot.c text.c texture.c typeConvert.c arcOp..c freehandOp.c boxOp.c brushOp.c circleOp.c fillOp.c fontOp.c lineOp.c pencilOp.c polygonOp.c splineOp.c selectOp.c sprayOp.c dynPenOp.c Colormap.c Paint.c PaintEvent.c PaintRegion.c PaintUndo.c > .depend
===> Building for xpaint-2.9.1.4
if test `grep -c XAW3DXF Local.xawdefs` = 1 ; then cd xaw3dxft ; xmkmf ; make ; cd .. ; fi
mv -f Makefile Makefile.bak
imake -DUseInstalled -I/usr/local/lib/X11/config
+ mkdir unshared
rm -f AllWidgets.o unshared/AllWidgets.o
cc -c -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO AllWidgets.c -o unshared/AllWidgets.o
rm -f AllWidgets.o
cc -c -O2 -fno-strict-aliasing -pipe -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -fPIC AllWidgets.c
rm -f AsciiSink.o unshared/AsciiSink.o
cc -c -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO AsciiSink.c -o unshared/AsciiSink.o
In file included from /usr/local/include/X11/Xft/Xft.h:39,
from AsciiSink.c:56:
/usr/local/include/ft2build.h:56:38: error: freetype/config/ftheader.h: No such file or directory
In file included from AsciiSink.c:56:
/usr/local/include/X11/Xft/Xft.h:40:10: error: #include expects "FILENAME" or <FILENAME>
In file included from AsciiSink.c:56:
/usr/local/include/X11/Xft/Xft.h:60: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_XftFTlibrary'
/usr/local/include/X11/Xft/Xft.h:94: error: expected specifier-qualifier-list before 'FT_UInt'
/usr/local/include/X11/Xft/Xft.h:101: error: expected specifier-qualifier-list before 'FT_UInt'
/usr/local/include/X11/Xft/Xft.h:188: error: expected ';', ',' or ')' before '*' token
/usr/local/include/X11/Xft/Xft.h:293: error: expected ';', ',' or ')' before '*' token
/usr/local/include/X11/Xft/Xft.h:352: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftLockFace'
/usr/local/include/X11/Xft/Xft.h:391: error: expected ';', ',' or ')' before '*' token
/usr/local/include/X11/Xft/Xft.h:397: error: expected ';', ',' or ')' before '*' token
/usr/local/include/X11/Xft/Xft.h:406: error: expected declaration specifiers or '...' before 'FT_UInt'
/usr/local/include/X11/Xft/Xft.h:407: error: expected declaration specifiers or '...' before 'FT_UInt'
/usr/local/include/X11/Xft/Xft.h:416: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftCharIndex'
/usr/local/include/X11/Xft/Xft.h:449: error: expected ';', ',' or ')' before '*' token
*** Error code 1

Stop in /bkp/ports/graphics/xpaint/work/xpaint-2.9.1.4/xaw3dxft.
*** Error code 1

Stop in /bkp/ports/graphics/xpaint/work/xpaint-2.9.1.4.
*** Error code 1

Stop in /bkp/ports/graphics/xpaint.

===>>> make failed for graphics/xpaint
===>>> Aborting update

Terminated
Terminated
d254(7.3-S)[3] ^D
Script done on Fri Jul 16 11:20:49 2010

I typically upgrade my installed ports daily; I've attached a list of
the installed ports (well, actually the result of "ls" in /var/db/pkg).

Hints?

Peace,
david
--
David H. Wolfskill david(a)catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
From: Anonymous on
David Wolfskill <david(a)catwhisker.org> writes:

[...]
> cc -c -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO AsciiSink.c -o unshared/AsciiSink.o
> In file included from /usr/local/include/X11/Xft/Xft.h:39,
> from AsciiSink.c:56:
> /usr/local/include/ft2build.h:56:38: error: freetype/config/ftheader.h: No such file or directory
> In file included from AsciiSink.c:56:
> /usr/local/include/X11/Xft/Xft.h:40:10: error: #include expects "FILENAME" or <FILENAME>
> In file included from AsciiSink.c:56:
> /usr/local/include/X11/Xft/Xft.h:60: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_XftFTlibrary'
> /usr/local/include/X11/Xft/Xft.h:94: error: expected specifier-qualifier-list before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:101: error: expected specifier-qualifier-list before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:188: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:293: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:352: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftLockFace'
> /usr/local/include/X11/Xft/Xft.h:391: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:397: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:406: error: expected declaration specifiers or '...' before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:407: error: expected declaration specifiers or '...' before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:416: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftCharIndex'
> /usr/local/include/X11/Xft/Xft.h:449: error: expected ';', ',' or ')' before '*' token
> *** Error code 1

Can you try following patch?

%%
Index: graphics/xpaint/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/xpaint/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- graphics/xpaint/Makefile 16 Jul 2010 03:31:49 -0000 1.72
+++ graphics/xpaint/Makefile 16 Jul 2010 20:02:44 -0000
@@ -20,6 +20,10 @@ USE_BZIP2= yes
USE_IMAKE= yes
USE_XORG= xft xmu xpm

+MAKE_JOBS_UNSAFE=yes
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= xaw3dxft.a
+
MAN1= xpaint.1

post-extract:
@@ -32,7 +36,4 @@ post-patch:
s|@XPMDIR@|${LOCALBASE}|g ; \
s|@LOCALBASE@|${LOCALBASE}|g' ${WRKSRC}/Local.config

-pre-configure:
- @cd ${WRKSRC} && ${SH} ./configure xaw3dxft.a
-
.include <bsd.port.mk>
Index: graphics/xpaint/files/patch-xaw3dxft-Imakefile
===================================================================
RCS file: graphics/xpaint/files/patch-xaw3dxft-Imakefile
diff -N graphics/xpaint/files/patch-xaw3dxft-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/xpaint/files/patch-xaw3dxft-Imakefile 16 Jul 2010 19:19:20 -0000
@@ -0,0 +1,17 @@
+--- xaw3dxft/Imakefile~
++++ xaw3dxft/Imakefile
+@@ -1,3 +1,5 @@
++#include "../Local.config"
++
+ #ifndef XCOMM
+ #define XCOMM #
+ #endif
+@@ -25,7 +27,7 @@ XCOMM For scrollbars with arrows, define
+ #define IncSubSubdir Xaw3dxft
+
+ XCOMM When building outside an X11 source tree:
+-EXTRA_INCLUDES = -I. -I/usr/include/X11/Xft -I/usr/include/freetype2
++EXTRA_INCLUDES = -I. $(XFT_INCLUDE)
+
+ #ifdef SharedXawReqs
+ REQUIREDLIBS = SharedXawReqs -lXft
%%
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: David Wolfskill on
On Sat, Jul 17, 2010 at 12:10:10AM +0400, Anonymous wrote:
> ...
> Can you try following patch?
> ...

Sure; thanks!

d254(7.3-S)[3] portmaster xpaint-2.7.8.1_4

===>>> Currently installed version: xpaint-2.7.8.1_4
===>>> Port directory: /usr/ports/graphics/xpaint

===>>> Gathering distinfo list for installed ports

===>>> Launching 'make checksum' for graphics/xpaint in background
===>>> Gathering dependency list for graphics/xpaint from ports
...
pdfconcat.c: In function 'main':
pdfconcat.c:1291: warning: traditional C rejects ISO C style function definitions
+ exit
install -c pdfconcat /usr/local/bin
install in . done
rm -f /usr/local/man/man1/xpaint.1*
/usr/bin/install -c -m 0444 xpaint._man /usr/local/man/man1/xpaint.1
gzip -n /usr/local/man/man1/xpaint.1
install.man in . done
===> Registering installation for xpaint-2.9.1.4

===> Cleaning for xpaint-2.9.1.4

===>>> Delete xpaint-2.7.8.1.tar.bz2? y/n [n] y
===>>> Upgrade of xpaint-2.7.8.1_4 to xpaint-2.9.1.4 complete

d254(7.3-S)[4] echo $?
0
d254(7.3-S)[5]


Looks good to me -- thanks!

Peace,
david
--
David H. Wolfskill david(a)catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.