aboutsummaryrefslogtreecommitdiff
path: root/graphics/xpx
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-06-19 07:45:26 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-06-19 07:45:26 +0000
commit89ff5af414a8366fa432747ca52259775c09dfb9 (patch)
tree3424328cda86e27f72fbb4c0bf2ff7b6b14574a7 /graphics/xpx
parent1c6259715bccc5578a18260fd37f04d20b6fc24b (diff)
downloadports-89ff5af414a8366fa432747ca52259775c09dfb9.tar.gz
ports-89ff5af414a8366fa432747ca52259775c09dfb9.zip
- Fix build with gcc4
- Support PORTDOCS/PLIST_FILES PR: 113776 Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes: svn path=/head/; revision=193850
Diffstat (limited to 'graphics/xpx')
-rw-r--r--graphics/xpx/Makefile18
-rw-r--r--graphics/xpx/files/patch-aa21
-rw-r--r--graphics/xpx/pkg-plist4
3 files changed, 14 insertions, 29 deletions
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index e6a52f0e3002..06bb3b717ef1 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -10,19 +10,29 @@ PORTVERSION= 1.41
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/xpx/
-DISTNAME= xpx141
+DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple pixel editing tool to make datas for KISS
-WRKSRC= ${WRKDIR}/xpx
+WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
XMKMF= xmkmf
+DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
+PORTDOCS= xpx.doc xpxrc.eg
+PLIST_FILES= bin/xpx
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|myname|my_name|g' ${WRKSRC}/magtoppm.c
+ @${REINPLACE_CMD} -e '/edit_mode/d' ${WRKSRC}/work.h
+
post-install:
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/ja/xpx
- ${INSTALL_MAN} ${WRKSRC}/xpx.doc ${WRKSRC}/xpxrc.eg ${PREFIX}/share/doc/ja/xpx
+ ${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
.endif
.include <bsd.port.mk>
diff --git a/graphics/xpx/files/patch-aa b/graphics/xpx/files/patch-aa
index 44673dd630cb..d44b8c2e6423 100644
--- a/graphics/xpx/files/patch-aa
+++ b/graphics/xpx/files/patch-aa
@@ -9,24 +9,3 @@
$(OBJS) : $(HEADERS)
---- edit.c.orig Mon Apr 29 17:36:37 1996
-+++ edit.c Mon Jun 18 21:46:31 2007
-@@ -34,7 +34,7 @@
-
- /* work */
- static Window editfuncwin[3];
--static int edit_mode[3] = {EDIT_PLOT, EDIT_GETCOLOR, EDIT_GETCOLOR};
-+int edit_mode[3] = {EDIT_PLOT, EDIT_GETCOLOR, EDIT_GETCOLOR};
- static int area_mode = 0;
- static int circle_mode = 0;
- static int line_mode = 0;
---- magtoppm.c.orig Mon Apr 29 17:36:41 1996
-+++ magtoppm.c Mon Jun 18 21:46:06 2007
-@@ -53,7 +53,6 @@
-
- char rcsid_magtoppm[] = "$Id: magtoppm.c,v 1.22 1996/04/23 10:58:05 yav Exp $";
- static char rcsrev[] = "$Revision: 1.22 $";
--static char *myname = "magtoppm";
- static char mag_magic_number[] = "MAKI02 ";
- static struct {int x,y;} magpostbl[16]={
- {0,0},{1,0},{2,0},{4,0},{0,1},{1,1},{0,2},{1,2},
diff --git a/graphics/xpx/pkg-plist b/graphics/xpx/pkg-plist
deleted file mode 100644
index c9ff2857ea7b..000000000000
--- a/graphics/xpx/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/xpx
-share/doc/ja/xpx/xpx.doc
-share/doc/ja/xpx/xpxrc.eg
-@dirrm share/doc/ja/xpx