Re: xpdf build error: conflicts with new declaration with 'C' linkage

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

On Thu, 2 Aug 2007, Johnny C. Lam wrote:

> > ./+FILES: 153: Syntax error: redirection unexpected
> > ./+FILES: 153: Syntax error: redirection unexpected
> > ./+FILES: 153: Syntax error: redirection unexpected
> > ./+FILES: 153: Syntax error: redirection unexpected
> > => Registering installation for xpdf-3.02
> 
> Can you post your /var/db/pkg/xpdf-3.02/+FILES?

Thanks. I had a CVS conflict.

I had it patched like:

RCS file: /cvsroot/pkgsrc/mk/pkginstall/files,v
retrieving revision 1.2
diff -u -r1.2 files
--- mk/pkginstall/files 19 Jul 2006 22:26:26 -0000      1.2
+++ mk/pkginstall/files 4 Aug 2006 02:27:52 -0000
@@ -167,6 +167,9 @@
                                if ${TEST} -f "$file"; then
                                        ${ECHO} ""
                                        ${ECHO} "       $file already exists."
+                                       if ${TEST} -f "$f_eg"; then
+                                               ${ECHO} "           [$f_eg]"
+                                       fi
                                elif ${TEST} -f "$f_eg"; then
                                        ${ECHO} ""
                                        ${ECHO} "       $file"


  Jeremy C. Reed