Re: CVS commit: pkgsrc/editors/p5-Wx-Scintilla

[Jens Rehsack <sno%netbsd.org@localhost>]

On 17.09.2012 21:15, David Holland wrote:
> On Thu, Sep 13, 2012 at 02:14:02PM +0000, Jens Rehsack wrote:
>  > Added Files:
>  >    pkgsrc/editors/p5-Wx-Scintilla: DESCR Makefile distinfo
>  >    pkgsrc/editors/p5-Wx-Scintilla/patches: patch-aa
>  > 
>  > Log Message:
>  > Adding new package for CPAN module Wx::Scintilla version 0.39 as 
> requirement
>  > of scheduled update of editors/p5-Padre package into 
> editors/p5-Wx-Scintilla.
>  > 
>  > Scintilla is a contributed project which means it will not be the latest
>  > by the time a new wxWidgets distribution is released. And on the scintilla
>  > front, the Perl 5 lexer is not 100% bug free even and we do not have any
>  > kind of Perl 6 support in Scintilla.
>  > 
>  > The ambitious goal of this project is to provide fresh Perl 5 and maybe 6
>  > support in Wx while preserving compatibility with Wx::StyledTextCtrl and
>  > continually contribute it back to Scintilla project.
> 
> Failed build:
> 
> c++ -fPIC -c -o Scintilla.o -I. 
> -I/home/pkgbulk/b/pkg/lib/perl5/vendor_perl/5.14.0/x86_64-netbsd-thread-multi/Wx
>  -I/home/pkgbulk/b/pkg/lib/perl5/5.14.0/x86_64-netbsd-thread-multi/CORE 
> -I/home/pkgbulk/b/pkg/lib/wx/include/gtk2-unicode-release-2.8 
> -I/home/pkgbulk/b/pkg/include/wx-2.8  -pthread  -D_FILE_OFFSET_BITS=64 
> -D_LARGE_FILES -D__WXGTK__  -pthread -I/usr/include -fno-strict-aliasing 
> -pipe -fstack-protector -I/usr/pkg/include   -pthread  -I/usr/include 
> -DWXPL_EXT -DVERSION=\"0.39\" -DXS_VERSION=\"0.39\" Scintilla.c
> Scintilla.c:15:23: fatal error: cpp/wxapi.h: No such file or directory
> compilation terminated.
> 
Damn, I forgot to commit atached patch to x11/p5-Wx.

Would it be ok to commit it now? Does it need revbump?

/Jens

Index: x11/p5-Wx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/p5-Wx/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- x11/p5-Wx/buildlink3.mk     15 Sep 2012 10:07:11 -0000      1.13
+++ x11/p5-Wx/buildlink3.mk     18 Sep 2012 08:24:55 -0000
@@ -8,10 +8,11 @@
 BUILDLINK_API_DEPENDS.p5-Wx+=  p5-Wx>=0.91
 BUILDLINK_ABI_DEPENDS.p5-Wx+=  p5-Wx>=0.9911nb1
 BUILDLINK_PKGSRCDIR.p5-Wx?=    ../../x11/p5-Wx
-BUILDLINK_INCDIRS.p5-Wx?=      ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx
+BUILDLINK_INCDIRS.p5-Wx?=      ${PERL5_SUB_INSTALLVENDORARCH}/Wx/cpp
+BUILDLINK_LIBDIRS.p5-Wx?=      ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx
 
-# We want all of the arch-dependent DBI files.
-BUILDLINK_CONTENTS_FILTER.p5-Wx?=      ${GREP} '/auto/Wx/'
+# We want all of the arch-dependent Wx files.
+BUILDLINK_CONTENTS_FILTER.p5-Wx?=      ${GREP} ${PERL5_SUB_INSTALLVENDORARCH}
 
 BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.25:../../x11/p5-Alien-wxWidgets
 BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp