aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2002-10-20 06:54:28 +0800
committerjmz <jmz@FreeBSD.org>2002-10-20 06:54:28 +0800
commit09891c3113ad23d42d0edf3087800e3bfed77e8a (patch)
tree70f9a9c7212c972f97d5fe913f5dc940df1a67af /games
parentce5538c960dd981968799f854fb5da48abfbdc61 (diff)
downloadfreebsd-ports-gnome-09891c3113ad23d42d0edf3087800e3bfed77e8a.tar.gz
freebsd-ports-gnome-09891c3113ad23d42d0edf3087800e3bfed77e8a.tar.zst
freebsd-ports-gnome-09891c3113ad23d42d0edf3087800e3bfed77e8a.zip
Fix the build on -current (patch-aa)
Compile all targets in the do-build phase, fix install with XFree86-4, honor CFLAGS
Diffstat (limited to 'games')
-rw-r--r--games/xmris/Makefile10
-rw-r--r--games/xmris/files/patch-aa27
-rw-r--r--games/xmris/scripts/pre-configure5
3 files changed, 21 insertions, 21 deletions
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index d92798e84c79..382a3753afd7 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -6,6 +6,7 @@
PORTNAME= xmris
PORTVERSION= 4.04
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
@@ -14,11 +15,16 @@ EXTRACT_SUFX= .tgz
MAINTAINER= jmz@FreeBSD.org
-USE_GMAKE= yes
USE_IMAKE= yes
MAKE_FLAGS= XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
-ALL_TARGET= xmris
+ALL_TARGET= xmris xmred
MAN6= xmred.6 xmris.6 xmsit.6
+USE_REINPLACE= yes
+
+post-configure:
+ cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/MANSUFFIX = 1/MANSUFFIX = 6/' \
+ -e 's/OWNER = -o games/OWNER = -g games/' \
+ -e 's/^INSTMRISFLAGS.*/INSTMRISFLAGS = \$(OWNER) -m 2555/' Makefile
post-install:
@${CHMOD} g+w ${X11BASE}/lib/X11/xmris
diff --git a/games/xmris/files/patch-aa b/games/xmris/files/patch-aa
index 1c93aa97e9e5..da7d13e38483 100644
--- a/games/xmris/files/patch-aa
+++ b/games/xmris/files/patch-aa
@@ -1,14 +1,13 @@
-*** all.c.orig Fri Dec 22 04:05:56 1995
---- all.c Thu Dec 5 14:08:46 1996
-***************
-*** 638,644 ****
---- 638,646 ----
- */
- {
- extern int sys_nerr;
-+ #ifndef __FreeBSD__
- extern char *sys_errlist[];
-+ #endif
-
- int error;
-
+--- all.c.orig Fri Dec 22 13:05:56 1995
++++ all.c Sat Oct 19 22:49:11 2002
+@@ -637,8 +637,10 @@
+ * returns the error string, or NULL
+ */
+ {
++#ifndef __FreeBSD__
+ extern int sys_nerr;
+ extern char *sys_errlist[];
++#endif
+
+ int error;
+
diff --git a/games/xmris/scripts/pre-configure b/games/xmris/scripts/pre-configure
index a4862a85a6bd..1f40dd7c9a56 100644
--- a/games/xmris/scripts/pre-configure
+++ b/games/xmris/scripts/pre-configure
@@ -7,9 +7,4 @@ echo "LOCAL=$PREFIX" >${WRKSRC}/Imakefile || exit 1;
# remove extra space after \ in continuation lines
sed -e 's/\\ $/\\/' <${WRKSRC}/Imakefile.orig >>${WRKSRC}/Imakefile || exit 1
-echo "CDEBUGFLAGS=-O2" >>${WRKSRC}/Imakefile || exit 1
-echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile || exit 1
-echo "OWNER = -g games" >>${WRKSRC}/Imakefile || exit 1
-echo "INSTMRISFLAGS = \$(OWNER) -m 2555" >>${WRKSRC}/Imakefile || exit 1
-
exit 0