Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jan 2014 23:02:29 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339298 - head/x11-toolkits/plib
Message-ID:  <201401092302.s09N2TmF081945@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Jan  9 23:02:29 2014
New Revision: 339298
URL: http://svnweb.freebsd.org/changeset/ports/339298

Log:
  Remove NEED_ROOT, older automake generate bogus Makefile.in that run RANLIB twice:
  one at build time, the second time at install time (which is wrong given the file has a 444 mode)
  While here remove check for unsupported versions

Modified:
  head/x11-toolkits/plib/Makefile

Modified: head/x11-toolkits/plib/Makefile
==============================================================================
--- head/x11-toolkits/plib/Makefile	Thu Jan  9 22:49:44 2014	(r339297)
+++ head/x11-toolkits/plib/Makefile	Thu Jan  9 23:02:29 2014	(r339298)
@@ -14,23 +14,19 @@ USES=		gmake
 USE_XORG=	xt xi xmu xext x11
 USE_GL=		glu
 GNU_CONFIGURE=	yes
-NEED_ROOT=	yes
 
 CXXFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
-
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-js-jsBSD.cxx
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread||g ; \
 		 s|-ldl||g ; \
 		 s|-lc_r||g' ${WRKSRC}/configure
-.if ${OSVERSION} >= 800064
+	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/*/Makefile.in
 	@${ECHO} "JS component is not compiled with new usb stack"
-.endif
 
 post-build:
 	${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c
@@ -38,4 +34,4 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/plib-jscal ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401092302.s09N2TmF081945>