From owner-svn-ports-all@FreeBSD.ORG  Sat Nov 10 13:49:52 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6F99F447;
 Sat, 10 Nov 2012 13:49:52 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 555428FC08;
 Sat, 10 Nov 2012 13:49:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAADnqDx023158;
 Sat, 10 Nov 2012 13:49:52 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAADnqvc023157;
 Sat, 10 Nov 2012 13:49:52 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201211101349.qAADnqvc023157@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 10 Nov 2012 13:49:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307278 - head/math/xspread
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 13:49:52 -0000

Author: pawel
Date: Sat Nov 10 13:49:51 2012
New Revision: 307278
URL: http://svnweb.freebsd.org/changeset/ports/307278

Log:
  - Update MASTER_SITES
  - Add LICENSE
  - Add MAKE_JOBS_SAFE
  - Use PLIST_FILES instead of pkg-plist
  
  While I'm here:
  - Fix COMMENT
  - Fix build when X11=on
  - Make sure that configure script looks for x11 libs in right
    dir when LOCALBASE != /usr/local
  
  PR:		ports/172033
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Deleted:
  head/math/xspread/pkg-plist
Modified:
  head/math/xspread/Makefile

Modified: head/math/xspread/Makefile
==============================================================================
--- head/math/xspread/Makefile	Sat Nov 10 13:36:36 2012	(r307277)
+++ head/math/xspread/Makefile	Sat Nov 10 13:49:51 2012	(r307278)
@@ -1,34 +1,57 @@
-# New ports collection makefile for:	xspread
-# Date created:		28 June 1995
-# Whom:			janek@gaja.ipan.lublin.pl
-#
+# Created by: janek@gaja.ipan.lublin.pl
 # $FreeBSD$
-#
 
 PORTNAME=	xspread
 PORTVERSION=	3.1.1c
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	# disappeared
+MASTER_SITES=	http://archive.debian.org/%SUBDIR%/ \
+		http://mirror.safehostnet.com/debian-archive/%SUBDIR%/ \
+		http://mirrors.xmission.com/debian-archive/%SUBDIR%/ \
+		http://vos-systems.net/ftp/%SUBDIR%/
+MASTER_SITE_SUBDIR=	debian/dists/potato/main/source/math
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A spreadsheet program for X and terminals
+COMMENT=	Spreadsheet program for X and terminals
+
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	X11 DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	-I${LOCALBASE}/include
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		xspread.1 pxspread.1
+PORTDOCS=	*
+PLIST_FILES=	bin/pxspread bin/xspread
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	x11 xau xdmcp xt
+LIB_DEPENDS+=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		xcb:${PORTSDIR}/x11/libxcb
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+CONFIGURE_ENV+=	ac_cv_header_X11_X_h=no
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|/usr/local/lib/libXt|${LOCALBASE}/lib/libXt|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|^void main|int main|' ${WRKSRC}/psc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxspread ${PREFIX}/bin/pxspread
 	${INSTALL_PROGRAM} ${WRKSRC}/xspread ${PREFIX}/bin/xspread
 	${INSTALL_MAN} ${WRKSRC}/pxspread.man ${MANPREFIX}/man/man1/pxspread.1
 	${INSTALL_MAN} ${WRKSRC}/xspread.man ${MANPREFIX}/man/man1/xspread.1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/x/notes ${DOCSDIR}