From owner-svn-ports-all@FreeBSD.ORG Sun Jun 29 21:45:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D840F12; Sun, 29 Jun 2014 21:45:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 572422C37; Sun, 29 Jun 2014 21:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5TLj540055480; Sun, 29 Jun 2014 21:45:05 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5TLj3YW055470; Sun, 29 Jun 2014 21:45:03 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201406292145.s5TLj3YW055470@svn.freebsd.org> From: Tijl Coosemans Date: Sun, 29 Jun 2014 21:45:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359794 - in head: astro/wmglobe misc/wmweather+ x11-wm/libwraster x11-wm/windowmaker x11-wm/wmakerconf x11/wdm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2014 21:45:05 -0000 Author: tijl Date: Sun Jun 29 21:45:03 2014 New Revision: 359794 URL: http://svnweb.freebsd.org/changeset/ports/359794 QAT: https://qat.redports.org/buildarchive/r359794/ Log: x11-wm/libwraster: - USES=libtool - Remove -DPREFIX=\\\"${PREFIX}\\\" from CPPFLAGS. Not needed and it causes configure test failures with clang. - Use MAKE_CMD. - Bump dependent ports. x11-wm/windowmaker: - USES=libtool - Replace -DPREFIX=\\\"${PREFIX}\\\" in CPPFLAGS with post-patch command because it causes configure test failures with clang. - Remove FreeBSD < 8 support. Modified: head/astro/wmglobe/Makefile head/misc/wmweather+/Makefile head/x11-wm/libwraster/Makefile head/x11-wm/libwraster/pkg-plist head/x11-wm/windowmaker/Makefile head/x11-wm/windowmaker/pkg-plist head/x11-wm/wmakerconf/Makefile head/x11/wdm/Makefile Modified: head/astro/wmglobe/Makefile ============================================================================== --- head/astro/wmglobe/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/astro/wmglobe/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -3,7 +3,7 @@ PORTNAME= wmglobe PORTVERSION= 1.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= astro windowmaker geography MASTER_SITES= http://hamete.org/static/wmg/ Modified: head/misc/wmweather+/Makefile ============================================================================== --- head/misc/wmweather+/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/misc/wmweather+/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -3,7 +3,7 @@ PORTNAME= wmweather+ PORTVERSION= 2.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker geography MASTER_SITES= SF/wmweatherplus/wmweather%2B/ \ SF/nemysisfreebsdp/misc/:icons Modified: head/x11-wm/libwraster/Makefile ============================================================================== --- head/x11-wm/libwraster/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11-wm/libwraster/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -2,7 +2,7 @@ PORTNAME= libwraster PORTVERSION= 0.95.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= source/release @@ -18,12 +18,12 @@ LIB_DEPENDS= libgif.so:${PORTSDIR}/graph libjbig.so:${PORTSDIR}/graphics/jbigkit \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= pathfix pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool pathfix pkgconfig USE_LDCONFIG= yes USE_XORG= xft xinerama xmu xpm BUILD_WRKSRC= ${WRKSRC}/wrlib INSTALL_WRKSRC= ${WRKSRC}/wrlib +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${PREFIX}/share/locale \ --with-libs-from="-L${LOCALBASE}/lib" \ @@ -32,11 +32,11 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFI --enable-modelock \ --enable-xinerama --enable-usermenu \ --with-x -CPPFLAGS+= -DPREFIX=\\\"${PREFIX}\\\" -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib pre-build: - cd ${WRKSRC} && ${MAKE} config-paths.h + cd ${WRKSRC} && ${MAKE_CMD} config-paths.h post-install: cd ${WRKSRC}/doc && ${INSTALL_MAN} \ Modified: head/x11-wm/libwraster/pkg-plist ============================================================================== --- head/x11-wm/libwraster/pkg-plist Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11-wm/libwraster/pkg-plist Sun Jun 29 21:45:03 2014 (r359794) @@ -1,8 +1,8 @@ bin/get-wraster-flags include/wraster.h lib/libwraster.a -lib/libwraster.la lib/libwraster.so -lib/libwraster.so.4 +lib/libwraster.so.3 +lib/libwraster.so.3.1.1 libdata/pkgconfig/wrlib.pc man/man1/get-wraster-flags.1.gz Modified: head/x11-wm/windowmaker/Makefile ============================================================================== --- head/x11-wm/windowmaker/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11-wm/windowmaker/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -3,7 +3,7 @@ PORTNAME= windowmaker PORTVERSION= 0.95.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= source/release @@ -22,10 +22,10 @@ LIB_DEPENDS= libgif.so:${PORTSDIR}/graph RUN_DEPENDS= libwraster>=${PORTVERSION}:${PORTSDIR}/x11-wm/libwraster \ ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons -USES= pathfix perl5 pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool pathfix perl5 pkgconfig USE_LDCONFIG= yes USE_XORG= xft xinerama xmu xpm +GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-nlsdir=${PREFIX}/share/locale \ @@ -35,7 +35,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFI --enable-modelock \ --enable-xinerama --enable-usermenu \ --with-x -CPPFLAGS+= -DPREFIX=\\\"${PREFIX}\\\" -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \ INSTALL-WMAKER NEWS README README.definable-cursor TODO @@ -50,14 +50,10 @@ NLS_CONFIGURE_ENABLE= locale XRANDR_USE= XORG=xrandr XRANDR_CONFIGURE_ENABLE= xrandr -.include - -.if ${ARCH} == amd64 && ${OSVERSION} < 800000 -CONFIGURE_ENV+= ac_cv_c_inline_asm=no -.endif -.if ${OSVERSION} < 800000 -CPPFLAGS+= -DHAVE_SYS_SELECT_H -.endif +post-patch: + @${REINPLACE_CMD} 's,PREFIX,"${PREFIX}",' \ + ${WRKSRC}/WINGs/wapplication.c ${WRKSRC}/WPrefs.app/Menu.c \ + ${WRKSRC}/WPrefs.app/Paths.c ${WRKSRC}/util/wmgenmenu.c post-install: @${MKDIR} \ @@ -66,4 +62,4 @@ post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/x11-wm/windowmaker/pkg-plist ============================================================================== --- head/x11-wm/windowmaker/pkg-plist Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11-wm/windowmaker/pkg-plist Sun Jun 29 21:45:03 2014 (r359794) @@ -103,17 +103,17 @@ include/WINGs/WINGsP.h include/WINGs/WUtil.h include/WMaker.h lib/libWINGs.a -lib/libWINGs.la lib/libWINGs.so lib/libWINGs.so.2 +lib/libWINGs.so.2.0.1 lib/libWMaker.a -lib/libWMaker.la lib/libWMaker.so lib/libWMaker.so.1 +lib/libWMaker.so.1.0.1 lib/libWUtil.a -lib/libWUtil.la lib/libWUtil.so lib/libWUtil.so.3 +lib/libWUtil.so.3.0.0 libdata/pkgconfig/WINGs.pc share/WINGs/Images.tiff share/WINGs/Images.xpm Modified: head/x11-wm/wmakerconf/Makefile ============================================================================== --- head/x11-wm/wmakerconf/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11-wm/wmakerconf/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -4,7 +4,7 @@ PORTNAME= wmakerconf PORTVERSION= 2.12 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/x11/wdm/Makefile ============================================================================== --- head/x11/wdm/Makefile Sun Jun 29 21:17:54 2014 (r359793) +++ head/x11/wdm/Makefile Sun Jun 29 21:45:03 2014 (r359794) @@ -3,7 +3,7 @@ PORTNAME= wdm PORTVERSION= 1.28 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11 windowmaker MASTER_SITES= http://voins.program.ru/wdm/:wdm \ http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \