Attachment #134845 for bug #179581

View | Details | Raw Unified | Return to bug 179581
Collapse All | Expand All




# Created by: jmz
# Date created:		19 February 1995
# Whom:			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=	XCONTRIB/applications/pixmap
MASTER_SITE_SUBDIR=	applications/pixmap
DISTNAME=	${PORTNAME}${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Pixmap editor based on XPM library

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

# requires rgb.txt
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
USE_IMAKE=	yes

CFLAGS+=	-D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= \
		-D_X_DEPRECATED= -DUSG

MAN1=		pixmap.1

.include <bsd.port.mk>




--- 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;
 }

Line 0 Link Here

(-)graphics/pixmap/files/patch-Pixmap.c (+10 lines)
	1	--- Pixmap.c.orig
	2	+++ Pixmap.c
	3	@@ -67,6 +67,7 @@
	4	#include "PixmapP.h"
	5
	6	#include <stdio.h>
	7	+#include <stdlib.h>
	8	#include <math.h>
	9
	10	#define XtStrlen(s) ((s) ? strlen(s) : 0)

Line 0 Link Here

(-)graphics/pixmap/files/patch-SelFile__Draw.c (+11 lines)
	1	--- SelFile/Draw.c.orig
	2	+++ SelFile/Draw.c
	3	@@ -189,7 +189,7 @@
	4	}
	5	}
	6
	7	-static
	8	+static void
	9	SFdeleteEntry(dir, entry)
	10	SFDir *dir;
	11	SFEntry *entry;

Line 0 Link Here

(-)graphics/pixmap/files/patch-SelFile__Path.c (+10 lines)
	1	--- SelFile/Path.c.orig
	2	+++ SelFile/Path.c
	3	@@ -529,6 +529,7 @@
	4	return 0;
	5	}
	6
	7	+void
	8	SFupdatePath()
	9	{
	10	static int alloc;

Return to bug 179581

Lines 1-31 Link Here

(-)graphics/pixmap/Makefile (-14 / +14 lines)
1	# New ports collection makefile for: pixmap	1	# Created by: jmz
2	# Date created: 19 February 1995
3	# Whom: jmz
4	#
5	# $FreeBSD: head/graphics/pixmap/Makefile 300896 2012-07-14 13:54:48Z beat $	2	# $FreeBSD: head/graphics/pixmap/Makefile 300896 2012-07-14 13:54:48Z beat $
6	#
7		3
8	PORTNAME= pixmap	4	PORTNAME= pixmap
9	PORTVERSION= 2.6	5	PORTVERSION= 2.6
10	PORTREVISION= 3	6	PORTREVISION= 3
11	CATEGORIES= graphics	7	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_XCONTRIB}	8	MASTER_SITES= XCONTRIB/applications/pixmap
13	MASTER_SITE_SUBDIR= applications/pixmap
14	DISTNAME= ${PORTNAME}${PORTVERSION}	9	DISTNAME= ${PORTNAME}${PORTVERSION}
15		10
16	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A pixmap editor based on XPM library	12	COMMENT= Pixmap editor based on XPM library
		13
		14	LICENSE= MIT
		15	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
18		16
19	# requires rgb.txt	17	# requires rgb.txt
20	BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb \	18	BUILD_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \
21	showrgb:${PORTSDIR}/x11/rgb	19	xrdb:${PORTSDIR}/x11/xrdb
22		20
		21	WRKSRC= ${WRKDIR}/${PORTNAME}
23		22
24	WRKSRC= ${WRKDIR}/pixmap
25	USE_IMAKE= yes
26	USE_XORG= xpm xbitmaps x11 xaw xmu xt sm ice xext	23	USE_XORG= xpm xbitmaps x11 xaw xmu xt sm ice xext
27	MAN1= pixmap.1	24	USE_IMAKE= yes
		25
		26	CFLAGS+= -D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= \
		27	-D_X_DEPRECATED= -DUSG
28		28
29	CFLAGS+= -D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)=	29	MAN1= pixmap.1
30		30
31	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/pixmap/files/patch-PixEdit.c (+25 lines)
	1	--- PixEdit.c.orig
	2	+++ PixEdit.c
	3	@@ -59,6 +59,7 @@
	4
	5
	6	#include <stdio.h>
	7	+#include <stdlib.h>
	8	#include <X11/Intrinsic.h>
	9	#include <X11/Xos.h>
	10	#include <X11/Xfuncs.h>
	11	@@ -1938,7 +1939,7 @@
	12
	13
	14
	15	-void main(argc, argv)
	16	+int main(argc, argv)
	17	int argc;
	18	char *argv[];
	19	{
	20	@@ -2281,4 +2282,5 @@
	21
	22	XtRealizeWidget(top_widget);
	23	XtAppMainLoop(pixmap_context);
	24	+ return 0;
	25	}