From owner-svn-ports-all@FreeBSD.ORG Thu Aug 21 13:19:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2B40F88; Thu, 21 Aug 2014 13:19:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82F2634E0; Thu, 21 Aug 2014 13:19:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7LDJJAE067101; Thu, 21 Aug 2014 13:19:19 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7LDJJ9N067099; Thu, 21 Aug 2014 13:19:19 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408211319.s7LDJJ9N067099@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 21 Aug 2014 13:19:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365556 - in head/graphics/mxp: . files 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Aug 2014 13:19:19 -0000 Author: marino Date: Thu Aug 21 13:19:18 2014 New Revision: 365556 URL: http://svnweb.freebsd.org/changeset/ports/365556 QAT: https://qat.redports.org/buildarchive/r365556/ Log: Stage graphics/mxp and unbreak FreeBSD 10+ PR: 192799 Submitted by: Ports Fury Deleted: head/graphics/mxp/files/patch-Makefile Modified: head/graphics/mxp/Makefile head/graphics/mxp/pkg-descr Modified: head/graphics/mxp/Makefile ============================================================================== --- head/graphics/mxp/Makefile Thu Aug 21 13:12:00 2014 (r365555) +++ head/graphics/mxp/Makefile Thu Aug 21 13:19:18 2014 (r365556) @@ -3,41 +3,49 @@ PORTNAME= mxp PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics -MASTER_SITES= SUNSITE -MASTER_SITE_SUBDIR=apps/math/fractals +MASTER_SITES= SUNSITE/apps/math/fractals MAINTAINER= ports@FreeBSD.org COMMENT= Application for computing/exploring Mandelbrot set +LICENSE= GPLv2 + WRKSRC= ${WRKDIR}/${PORTNAME} -ALL_TARGET= + USE_XORG= xaw xbitmaps xpm +ALL_TARGET= ${PORTNAME} MAKE_JOBS_UNSAFE= yes -PLIST_FILES= bin/${PORTNAME} \ - %%PORTDOCS%%%%DOCSDIR%%/README -PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% - -NO_STAGE= yes +CFLAGS+= -Wno-error=return-type +CPPFLAGS+= -I${LOCALBASE}/include -DXPM +LDFLAGS+= -L${LOCALBASE}/lib -lXpm + +PORTDOCS= README +PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.xpm + +DESKTOP_ENTRIES="Mxp" "Mandelbrot Explorer" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" "${PORTNAME}" \ + "" "" OPTIONS_DEFINE= DOCS -.include - -post-extract: - @${CP} ${WRKSRC}/Makefile.noimake ${WRKSRC}/Makefile post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|%%CFLAGS%%|${CFLAGS}|g; \ - s|%%CC%%|${CC}|g' ${WRKSRC}/Makefile + @(cd ${WRKSRC} && ${SED} -e \ + 's|$$(XINC)|$$(CPPFLAGS)| ; \ + s|-L/X/X11/lib|$$(LDFLAGS)|' Makefile.noimake > Makefile) + +post-build: + @${LN} -sf icon.xpm ${WRKSRC}/${PORTNAME}.xpm + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \ + ${STAGEDIR}${DOCSDIR}) .include Modified: head/graphics/mxp/pkg-descr ============================================================================== --- head/graphics/mxp/pkg-descr Thu Aug 21 13:12:00 2014 (r365555) +++ head/graphics/mxp/pkg-descr Thu Aug 21 13:19:18 2014 (r365556) @@ -11,4 +11,4 @@ Mandelbrot sets. Features of mxp includ - color change options - detailed statistics -WWW: http://www.ibiblio.org/pub/Linux/apps/math/fractals/ +WWW: http://www.ibiblio.org/pub/Linux/apps/math/fractals/