Bug 179581 - graphics/pixmap: Fix build on -current
Summary: graphics/pixmap: Fix build on -current
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: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-15 19:10 UTC by tkato432
Modified: 2013-06-17 16:10 UTC (History)
0 users

See Also:


Attachments
file.diff (3.39 KB, patch)
2013-06-15 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-06-15 19:10:01 UTC
- 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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-15 19:10:26 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-06-17 16:01:09 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-06-17 16:01:12 UTC
Author: miwi
Date: Mon Jun 17 15:01:02 2013
New Revision: 321122
URL: http://svnweb.freebsd.org/changeset/ports/321122

Log:
  - Fix build on -current
  - Add LICENSE
  - Trim header
  
  PR:		179581
  Submitted by:	Ports Fury

Added:
  head/graphics/pixmap/files/patch-PixEdit.c   (contents, props changed)
  head/graphics/pixmap/files/patch-Pixmap.c   (contents, props changed)
  head/graphics/pixmap/files/patch-SelFile__Draw.c   (contents, props changed)
  head/graphics/pixmap/files/patch-SelFile__Path.c   (contents, props changed)
Modified:
  head/graphics/pixmap/Makefile   (contents, props changed)

Modified: head/graphics/pixmap/Makefile
==============================================================================
--- head/graphics/pixmap/Makefile	Mon Jun 17 15:00:02 2013	(r321121)
+++ head/graphics/pixmap/Makefile	Mon Jun 17 15:01:02 2013	(r321122)
@@ -1,31 +1,31 @@
-# New ports collection makefile for:	pixmap
-# Date created:		19 February 1995
-# Whom:			jmz
-#
+# Created by: jmz
 # $FreeBSD$
-#
 
 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@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>

Added: head/graphics/pixmap/files/patch-PixEdit.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/pixmap/files/patch-PixEdit.c	Mon Jun 17 15:01:02 2013	(r321122)
@@ -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;
+ }

Added: head/graphics/pixmap/files/patch-Pixmap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/pixmap/files/patch-Pixmap.c	Mon Jun 17 15:01:02 2013	(r321122)
@@ -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)

Added: head/graphics/pixmap/files/patch-SelFile__Draw.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/pixmap/files/patch-SelFile__Draw.c	Mon Jun 17 15:01:02 2013	(r321122)
@@ -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;

Added: head/graphics/pixmap/files/patch-SelFile__Path.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/pixmap/files/patch-SelFile__Path.c	Mon Jun 17 15:01:02 2013	(r321122)
@@ -0,0 +1,10 @@
+--- SelFile/Path.c.orig
++++ SelFile/Path.c
+@@ -529,6 +529,7 @@
+ 	return 0;
+ }
+ 
++void
+ SFupdatePath()
+ {
+ 	static int	alloc;
_______________________________________________
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"