ports/179581: graphics/pixmap: Fix build on -current

[KATO Tsuguru]

>Number:         179581
>Category:       ports
>Synopsis:       graphics/pixmap: Fix build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 15 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Add LICENSE

New file:
files/patch-PixEdit.c
files/patch-Pixmap.c
files/patch-SelFile__Draw.c
files/patch-SelFile__Path.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/pixmap/Makefile graphics/pixmap/Makefile
--- /usr/ports/graphics/pixmap/Makefile	2012-11-08 09:31:21.000000000 +0900
+++ graphics/pixmap/Makefile	2013-06-16 00:00:00.000000000 +0900
@@ -1,31 +1,31 @@
-# New ports collection makefile for:	pixmap
-# Date created:		19 February 1995
-# Whom:			jmz
-#
+# Created by: jmz
 # $FreeBSD: head/graphics/pixmap/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	pixmap
 PORTVERSION=	2.6
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications/pixmap
+MASTER_SITES=	XCONTRIB/applications/pixmap
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A pixmap editor based on XPM library
+COMMENT=	Pixmap editor based on XPM library
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # requires rgb.txt
-BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb \
-		showrgb:${PORTSDIR}/x11/rgb
+BUILD_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb \
+		xrdb:${PORTSDIR}/x11/xrdb
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WRKSRC=		${WRKDIR}/pixmap
-USE_IMAKE=	yes
 USE_XORG=	xpm xbitmaps x11 xaw xmu xt sm ice xext
-MAN1=		pixmap.1
+USE_IMAKE=	yes
+
+CFLAGS+=	-D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= \
+		-D_X_DEPRECATED= -DUSG
 
-CFLAGS+=	-D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)=
+MAN1=		pixmap.1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/pixmap/files/patch-PixEdit.c graphics/pixmap/files/patch-PixEdit.c
--- /usr/ports/graphics/pixmap/files/patch-PixEdit.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/pixmap/files/patch-PixEdit.c	2013-06-16 00:00:00.000000000 +0900
@@ -0,0 +1,25 @@
+--- PixEdit.c.orig
++++ PixEdit.c
+@@ -59,6 +59,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/Xos.h>
+ #include <X11/Xfuncs.h>
+@@ -1938,7 +1939,7 @@
+ 
+ 
+ 
+-void main(argc, argv)
++int main(argc, argv)
+     int    argc;
+     char  *argv[];
+ {
+@@ -2281,4 +2282,5 @@
+ 
+     XtRealizeWidget(top_widget);
+     XtAppMainLoop(pixmap_context);
++    return 0;
+ }
diff -urN /usr/ports/graphics/pixmap/files/patch-Pixmap.c graphics/pixmap/files/patch-Pixmap.c
--- /usr/ports/graphics/pixmap/files/patch-Pixmap.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/pixmap/files/patch-Pixmap.c	2013-06-16 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- Pixmap.c.orig
++++ Pixmap.c
+@@ -67,6 +67,7 @@
+ #include "PixmapP.h"
+     
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <math.h>
+ 
+ #define XtStrlen(s)                   ((s) ? strlen(s) : 0)
diff -urN /usr/ports/graphics/pixmap/files/patch-SelFile__Draw.c graphics/pixmap/files/patch-SelFile__Draw.c
--- /usr/ports/graphics/pixmap/files/patch-SelFile__Draw.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/pixmap/files/patch-SelFile__Draw.c	2013-06-16 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- SelFile/Draw.c.orig
++++ SelFile/Draw.c
+@@ -189,7 +189,7 @@
+ 	}
+ }
+ 
+-static
++static void
+ SFdeleteEntry(dir, entry)
+ 	SFDir	*dir;
+ 	SFEntry	*entry;
diff -urN /usr/ports/graphics/pixmap/files/patch-SelFile__Path.c graphics/pixmap/files/patch-SelFile__Path.c
--- /usr/ports/graphics/pixmap/files/patch-SelFile__Path.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/pixmap/files/patch-SelFile__Path.c	2013-06-16 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- SelFile/Path.c.orig
++++ SelFile/Path.c
+@@ -529,6 +529,7 @@
+ 	return 0;
+ }
+ 
++void
+ SFupdatePath()
+ {
+ 	static int	alloc;
>Release-Note:
>Audit-Trail:
>Unformatted: