svn commit: r365556 - in head/graphics/mxp: . files

[John Marino]

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 at 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 <bsd.port.options.mk>
-
-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 <bsd.port.mk>

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/