aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--russian/wmcyrx/Makefile8
-rw-r--r--russian/wmcyrx/files/patch-aa7
2 files changed, 11 insertions, 4 deletions
diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile
index 040ad749986d..f798a4303857 100644
--- a/russian/wmcyrx/Makefile
+++ b/russian/wmcyrx/Makefile
@@ -20,10 +20,16 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
NO_INSTALL_MANPAGES= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400012
+MAKE_ENV= COPT="-fpermissive"
+.endif
+
post-extract:
@ ${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/cyrx2 ${PREFIX}/bin/wmcyrx2
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/russian/wmcyrx/files/patch-aa b/russian/wmcyrx/files/patch-aa
index 88acd68f84ce..19706df458a4 100644
--- a/russian/wmcyrx/files/patch-aa
+++ b/russian/wmcyrx/files/patch-aa
@@ -1,5 +1,5 @@
---- /usr/ports/russian/wmcyrx/work/cyrx-2.1/Makefile.orig Thu Apr 29 00:17:54 1999
-+++ /usr/ports/russian/wmcyrx/work/cyrx-2.1/Makefile Fri Dec 10 09:28:17 1999
+--- Makefile.orig Wed Apr 28 18:17:54 1999
++++ Makefile Thu May 25 18:58:23 2000
@@ -1,11 +1,11 @@
-I = -I/usr/openwin/include -I/usr/local/include
@@ -8,7 +8,8 @@
-L = -L/usr/local/lib -L/usr/openwin/lib -L/usr/X11/lib -lXpm -lX11 -lXext
+L = -L${LOCALBASE}/lib -L${X11BASE}/lib -L/usr/lib -lXpm -lX11 -lXext
#CC = gcc -O $I -DXLIB_ILLEGAL_ACCESS
- CC=CC -O $I -DXLIB_ILLEGAL_ACCESS
+-CC=CC -O $I -DXLIB_ILLEGAL_ACCESS
++CC+= ${CFLAGS} ${COPT} $I -DXLIB_ILLEGAL_ACCESS
-cyrx2: cyrx2.o cyrmapper.o
+all: cyrx2.o cyrmapper.o