On Wed, 13 May 2015, Mark Kettenis wrote:

> > Date: Wed, 13 May 2015 13:44:55 +0200
> > From: Marc Espie <[email protected]>
> > 
> > On Wed, May 13, 2015 at 01:19:40PM +0200, Mark Kettenis wrote:
> > > This is needed to make qt4 build with binutils 2.17, and fix a
> > > potential runtime issue even when compiled with 2.15.  Some of the
> > > other ports that embed webkit code might need similar treatment.
> > > 
> > > I suppose this needs a REVISION bump, but I'm not sure how to do that
> > > properly given that x11/qt4/Makefile has:
> > > 
> > > REVISION-main =         0
> > > 
> > > REVISION-mysql =        0
> > > 
> > > Any honts & ok's would be appreciated.
> > 
> > Well, it's a MULTI_PACKAGES. The webkit part lives in main, so you just
> > need to bump
> > REVISION-main = 1
> > 
> > -debug is not built by default (it often does not build, we don't check it
> > too often, considering how much time and space is needed). If you 
> > want to be pedantic, you can also set
> > REVISION-debug = 0
> > 
> > Everything else is either documentation/plugins/examples. 
> 
> Thanks.  Excellent!  Is that an ok espie@ if I change REVISION-main as well?

Since we're here... Can I remove this bogus line?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.126
diff -u -p -u -p -r1.126 Makefile
--- Makefile    13 May 2015 14:03:07 -0000      1.126
+++ Makefile    13 May 2015 19:59:32 -0000
@@ -117,7 +117,6 @@ CONFIGURE_ARGS +=   -platform openbsd-g++4
 
 # XXX make sure those libraries gets written to libQtGui.la
 QMAKE_LIBS_GUI =       freetype SM ICE Xi Xrender Xinerama fontconfig Xext X11
-#QMAKE_LIBS_GUI =
 
 CONFIGURE_ENV =                LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}" \
                        X11BASE=${X11BASE} 
QMAKE_LIBS_GUI="${QMAKE_LIBS_GUI:C/^/-l/}"

Reply via email to