Bug 172421 - [PATCH] x11-wm/windowmaker update to 0.95.3
Summary: [PATCH] x11-wm/windowmaker update to 0.95.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-07 04:50 UTC by Chris Petrik
Modified: 2012-10-08 08:00 UTC (History)
0 users

See Also:


Attachments
file.diff (7.71 KB, patch)
2012-10-07 04:50 UTC, Chris Petrik
no flags Details | Diff
windowmaker.diff (8.36 KB, patch)
2012-10-07 21:57 UTC, Guido Falsi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Petrik 2012-10-07 04:50:11 UTC
Update to 0.95.3
Update options to optionsng
Remove patches; they are no longer needed.

This version compiles out of the box with clang

Fix: Patch attached with submission follows:
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2012-10-07 10:52:45 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2012-10-07 21:57:10 UTC
Hi!

I had to make a few little modifications.

The windowmaker port also has a a slave port, x11-wm/libwraster. This 
patch also resets PORTREVISION on that. Apart from that it's the ame as 
your patch.

Can you approve this?

Thanks.

-- 
Guido Falsi <madpilot@FreeBSD.org>
Comment 3 Chris Petrik 2012-10-08 00:05:54 UTC
Approved :)
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2012-10-08 07:58:50 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-10-08 07:58:56 UTC
Author: madpilot
Date: Mon Oct  8 06:58:45 2012
New Revision: 305518
URL: http://svn.freebsd.org/changeset/ports/305518

Log:
  - Update to 0.95.3
  - Convert to new options framework
  - Reset PORTREVISION in slave port
  - Trim Makefile headers
  
  PR:		ports/172421
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)

Deleted:
  head/x11-wm/windowmaker/files/
Modified:
  head/x11-wm/libwraster/Makefile   (contents, props changed)
  head/x11-wm/windowmaker/Makefile   (contents, props changed)
  head/x11-wm/windowmaker/distinfo   (contents, props changed)
  head/x11-wm/windowmaker/pkg-plist   (contents, props changed)

Modified: head/x11-wm/libwraster/Makefile
==============================================================================
--- head/x11-wm/libwraster/Makefile	Mon Oct  8 05:16:58 2012	(r305517)
+++ head/x11-wm/libwraster/Makefile	Mon Oct  8 06:58:45 2012	(r305518)
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	libwraster
-# Date created:				August 17, 2009
-# Whom:					Doug Barton <dougb@FreeBSD.org>
-#
+# Created by: Doug Barton <dougb@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	libwraster from Window Maker
 

Modified: head/x11-wm/windowmaker/Makefile
==============================================================================
--- head/x11-wm/windowmaker/Makefile	Mon Oct  8 05:16:58 2012	(r305517)
+++ head/x11-wm/windowmaker/Makefile	Mon Oct  8 06:58:45 2012	(r305518)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	Window Maker
-# Date created:				August 13, 1997
-# Whom:					Brian Handy <handy@physics.montana.edu>
-#
+# Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME?=	windowmaker
-PORTVERSION=	0.95.2
-PORTREVISION?=	4
+PORTVERSION=	0.95.3
+PORTREVISION?=	0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -23,14 +20,12 @@ LIB_DEPENDS=	gif:${PORTSDIR}/graphics/gi
 .if !defined(LWR_SLAVE)
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 USE_PERL5=	yes
-
-OPTIONS=	XRANDR "xrandr support (EXPERIMENTAL)" off
+OPTIONS_DEFINE=	XRANDR
 .endif
 
 MAKE_JOBS_SAFE=	yes
 
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 USE_XORG=	xft xinerama xmu xpm
 USE_GETTEXT=	yes
@@ -60,16 +55,29 @@ CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
 BROKEN=		does not compile on FreeBSD 7.X
 .endif
 
-.if defined(WITH_XRANDR)
+.if ${PORT_OPTIONS:MXRANDR}
 USE_XORG+=	xrandr
 CONFIGURE_ARGS+=	--enable-xrandr
 .endif
 
 CONFLICTS=	libwraster-0.*
 
-MANLANG=	"" cs ru sk
-MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
-		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
+MANLANG=	"" cs sk ru
+MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
+		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
+		get-wraster-flags.1 get-wutil-flags.1 wdread.1 WindowMaker.1x \
+		wmagnify.1x wmgenmenu.1 wmmenugen.1 WPrefs.1x
+
+MAN8_EN=	upgrade-windowmaker-defaults.8
+
+MAN1_CS=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
+
+MAN1_SK=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
+
+MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
+		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
 
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor TODO
@@ -77,7 +85,7 @@ PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog
 LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
 CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
 
-pre-patch:
+post-patch:
 .for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
     WindowMaker/*menu*
 	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}

Modified: head/x11-wm/windowmaker/distinfo
==============================================================================
--- head/x11-wm/windowmaker/distinfo	Mon Oct  8 05:16:58 2012	(r305517)
+++ head/x11-wm/windowmaker/distinfo	Mon Oct  8 06:58:45 2012	(r305518)
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.2.tar.bz2) = 65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b
-SIZE (WindowMaker-0.95.2.tar.bz2) = 2190825
+SHA256 (WindowMaker-0.95.3.tar.gz) = b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a
+SIZE (WindowMaker-0.95.3.tar.gz) = 2780245

Modified: head/x11-wm/windowmaker/pkg-plist
==============================================================================
--- head/x11-wm/windowmaker/pkg-plist	Mon Oct  8 05:16:58 2012	(r305517)
+++ head/x11-wm/windowmaker/pkg-plist	Mon Oct  8 06:58:45 2012	(r305518)
@@ -101,6 +101,7 @@ include/WINGs/WINGs.h
 include/WINGs/WINGsP.h
 include/WINGs/WUtil.h
 include/wraster.h
+include/WMaker.h
 lib/libWINGs.a
 lib/libWINGs.la
 lib/libWINGs.so
@@ -113,6 +114,10 @@ lib/libwraster.a
 lib/libwraster.la
 lib/libwraster.so
 lib/libwraster.so.4
+lib/libWMaker.so.1
+lib/libWMaker.so
+lib/libWMaker.la
+lib/libWMaker.a
 libdata/pkgconfig/WINGs.pc
 libdata/pkgconfig/wrlib.pc
 share/WINGs/Images.tiff
@@ -331,6 +336,7 @@ share/locale/no/LC_MESSAGES/WindowMaker.
 share/locale/pl/LC_MESSAGES/WindowMaker.mo
 share/locale/pt/LC_MESSAGES/WPrefs.mo
 share/locale/pt/LC_MESSAGES/WindowMaker.mo
+share/locale/pt/LC_MESSAGES/wmgenmenu.mo
 share/locale/ro/LC_MESSAGES/WindowMaker.mo
 share/locale/ru/LC_MESSAGES/WPrefs.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"