[Midnightbsd-cvs] mports [19069] trunk/deskutils/xpostit: update patchset for xpostit

[laffer1 at midnightbsd.org]

Revision: 19069
          http://svnweb.midnightbsd.org/mports/?rev=19069
Author:   laffer1
Date:     2015-05-23 11:27:36 -0400 (Sat, 23 May 2015)
Log Message:
-----------
update patchset for xpostit

Modified Paths:
--------------
    trunk/deskutils/xpostit/Makefile
    trunk/deskutils/xpostit/pkg-plist

Added Paths:
-----------
    trunk/deskutils/xpostit/files/patch-plaid.c
    trunk/deskutils/xpostit/files/patch-xpostit.c

Removed Paths:
-------------
    trunk/deskutils/xpostit/files/patch-aa

Modified: trunk/deskutils/xpostit/Makefile
===================================================================
--- trunk/deskutils/xpostit/Makefile	2015-05-23 15:27:00 UTC (rev 19068)
+++ trunk/deskutils/xpostit/Makefile	2015-05-23 15:27:36 UTC (rev 19069)
@@ -2,11 +2,10 @@
 
 PORTNAME=	xpostit
 PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	PostIt (R) messages onto your X11 screen
@@ -13,9 +12,8 @@
 
 LICENSE=	unknown
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 WRKSRC=		${WRKDIR}/xpostit
-MAN1=		xpostit.1
 
 .include <bsd.port.mk>

Deleted: trunk/deskutils/xpostit/files/patch-aa
===================================================================
--- trunk/deskutils/xpostit/files/patch-aa	2015-05-23 15:27:00 UTC (rev 19068)
+++ trunk/deskutils/xpostit/files/patch-aa	2015-05-23 15:27:36 UTC (rev 19069)
@@ -1,50 +0,0 @@
---- plaid.c.orig	Thu Dec 10 17:40:26 1992
-+++ plaid.c	Mon May  6 13:23:17 1996
-@@ -60,6 +60,7 @@
- {
- 	Arg args[4];
- 	register int nargs;
-+	Dimension width, height;
- 
- 	/*
- 	 * Create the plaid widget.
-@@ -78,20 +79,22 @@
- 	 * Get the width and height of the widget.
- 	 */
- 	nargs = 0;
--	SetArg(XtNwidth, NULL);
--	SetArg(XtNheight, NULL);
-+	SetArg(XtNwidth, &width);
-+	SetArg(XtNheight, &height);
- 	XtGetValues(plaidwidget, args, nargs);
- 
- 	/*
- 	 * If the user didn't set them, then we
- 	 * should set them to the defaults.
- 	 */
--	if ((args[0].value == 0) || (args[1].value == 0)) {
--		if (args[0].value == 0)
--			XtSetArg(args[0], XtNwidth, DefaultPlaidWidth);
-+	if (width == 0 || height == 0) {
-+		nargs = 0;
- 
--		if (args[1].value == 0)
--			XtSetArg(args[1], XtNheight, DefaultPlaidHeight);
-+		if (width == 0)
-+			SetArg(XtNwidth, DefaultPlaidWidth);
-+
-+		if (height == 0)
-+			SetArg(XtNheight, DefaultPlaidHeight);
- 
- 		XtSetValues(plaidwidget, args, nargs);
- 	}
---- ./xpostit.c.org	Thu Dec 10 08:40:27 1992
-+++ ./xpostit.c	Thu Oct 31 21:31:14 1996
-@@ -121,7 +121,6 @@
- {
- 	Arg args[4];
- 	char *appname;
--	char *rindex();
- 	Atom protos[2];
- 	register int nargs;
- 	Boolean setsigs = False;

Added: trunk/deskutils/xpostit/files/patch-plaid.c
===================================================================
--- trunk/deskutils/xpostit/files/patch-plaid.c	                        (rev 0)
+++ trunk/deskutils/xpostit/files/patch-plaid.c	2015-05-23 15:27:36 UTC (rev 19069)
@@ -0,0 +1,40 @@
+--- plaid.c.orig	Thu Dec 10 17:40:26 1992
++++ plaid.c	Mon May  6 13:23:17 1996
+@@ -60,6 +60,7 @@
+ {
+ 	Arg args[4];
+ 	register int nargs;
++	Dimension width, height;
+ 
+ 	/*
+ 	 * Create the plaid widget.
+@@ -78,20 +79,22 @@
+ 	 * Get the width and height of the widget.
+ 	 */
+ 	nargs = 0;
+-	SetArg(XtNwidth, NULL);
+-	SetArg(XtNheight, NULL);
++	SetArg(XtNwidth, &width);
++	SetArg(XtNheight, &height);
+ 	XtGetValues(plaidwidget, args, nargs);
+ 
+ 	/*
+ 	 * If the user didn't set them, then we
+ 	 * should set them to the defaults.
+ 	 */
+-	if ((args[0].value == 0) || (args[1].value == 0)) {
+-		if (args[0].value == 0)
+-			XtSetArg(args[0], XtNwidth, DefaultPlaidWidth);
++	if (width == 0 || height == 0) {
++		nargs = 0;
+ 
+-		if (args[1].value == 0)
+-			XtSetArg(args[1], XtNheight, DefaultPlaidHeight);
++		if (width == 0)
++			SetArg(XtNwidth, DefaultPlaidWidth);
++
++		if (height == 0)
++			SetArg(XtNheight, DefaultPlaidHeight);
+ 
+ 		XtSetValues(plaidwidget, args, nargs);
+ 	}


Property changes on: trunk/deskutils/xpostit/files/patch-plaid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/deskutils/xpostit/files/patch-xpostit.c
===================================================================
--- trunk/deskutils/xpostit/files/patch-xpostit.c	                        (rev 0)
+++ trunk/deskutils/xpostit/files/patch-xpostit.c	2015-05-23 15:27:36 UTC (rev 19069)
@@ -0,0 +1,10 @@
+--- ./xpostit.c.org	Thu Dec 10 08:40:27 1992
++++ ./xpostit.c	Thu Oct 31 21:31:14 1996
+@@ -121,7 +121,6 @@
+ {
+ 	Arg args[4];
+ 	char *appname;
+-	char *rindex();
+ 	Atom protos[2];
+ 	register int nargs;
+ 	Boolean setsigs = False;


Property changes on: trunk/deskutils/xpostit/files/patch-xpostit.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/deskutils/xpostit/pkg-plist
===================================================================
--- trunk/deskutils/xpostit/pkg-plist	2015-05-23 15:27:00 UTC (rev 19068)
+++ trunk/deskutils/xpostit/pkg-plist	2015-05-23 15:27:36 UTC (rev 19069)
@@ -1,3 +1,4 @@
 bin/xpostit
 lib/X11/app-defaults/XPostit
 lib/X11/app-defaults/XPostit-color
+man/man1/xpostit.1.gz