Index: head/graphics/mxp/Makefile
===================================================================
--- head/graphics/mxp/Makefile	(revision 365555)
+++ head/graphics/mxp/Makefile	(revision 365556)
@@ -1,43 +1,51 @@
 # Created by: NAKATA Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 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%%
+CFLAGS+=	-Wno-error=return-type
+CPPFLAGS+=	-I${LOCALBASE}/include -DXPM
+LDFLAGS+=	-L${LOCALBASE}/lib -lXpm
 
-NO_STAGE=	yes
+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>
Index: head/graphics/mxp/files/patch-Makefile
===================================================================
--- head/graphics/mxp/files/patch-Makefile	(revision 365555)
+++ head/graphics/mxp/files/patch-Makefile	(nonexistent)
@@ -1,50 +0,0 @@
---- Makefile.orig	Sat Feb 12 16:42:03 2005
-+++ Makefile	Sat Feb 12 16:42:45 2005
-@@ -1,30 +1,30 @@
- # Makefile file for mxp - Mandelbrot Explorer
- 
- # Compiler - uncomment for gcc
--# CC = gcc
-+CC = %%CC%%
- 
- # Since this is a compute intensive program, be sure to use
- # compiler optimization. It makes a big difference.
- # For gcc on linux "-O2 -m486" works well. 
--# OPT = -O2 -m486
-+OPT = %%CFLAGS%%
- 
- # If X is not installed in the standard places you will need to set the
- # following 2 defines.
--XLIBS = -L/usr/openwin/lib
--XINC = -I/usr/openwin/include
-+XLIBS = -L%%LOCALBASE%%/lib
-+XINC = -I%%LOCALBASE%%/include
- 
- # Specify where your Xpm installation directories are
- # If you have the XPM libraries uncomment and adjust the following lines
- # to use color icons.
--#XPM_DEF = -DXPM
--#XPM_INCLUDE = -I/usr/local/include
--#XPM_LIB = -L$(LIBDIR)/xpm -lXpm
-+XPM_DEF = -DXPM
-+XPM_INCLUDE = #-I/usr/local/include
-+XPM_LIB = -lXpm #-L$(LIBDIR)/xpm 
- 
- # If you are using FVWM 2.0 then the following must be set to 2
- SIZE_INC = 1
-   
- # Specify install directory
--BINDIR = /usr/local/bin
-+BINDIR = %%PREFIX%%/bin
- 
- INCLUDES = $(XPM_INCLUDE) $(XINC) -Ilug
- 
-@@ -34,7 +34,7 @@
- OBJS = $(M_OBJS) $(L_OBJS)
- 
- mxp: $(OBJS)
--	$(CC) -o $@ $(OBJS) $(XPM_LIB) -L/X/X11/lib -lm -lXaw -lXt -lXmu -lX11 -lXdmcp -lXext
-+	$(CC) -o $@ $(OBJS) $(XPM_LIB) $(XLIBS) -lm -lXaw -lXt -lXmu -lX11 -lXdmcp -lXext
- 
- $(OBJS): mxp.h
- 

Property changes on: head/graphics/mxp/files/patch-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/mxp/pkg-descr
===================================================================
--- head/graphics/mxp/pkg-descr	(revision 365555)
+++ head/graphics/mxp/pkg-descr	(revision 365556)
@@ -1,14 +1,14 @@
 Mxp (Mandelbrot explorer) is an X application for computing and exploring
 Mandelbrot sets.  Features of mxp include:
         - zoom and un-zoom
         - dynamic resizing of drawing window
         - setup save/load
         - asynchronous image generation (buttons always work)
         - GIF output
         - animation
         - nine color schemes
         - color rotation
         - 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/