diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2002-12-17 04:39:46 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2002-12-17 04:39:46 +0000 |
| commit | fb16006cf634b865efeb53743fb2910a89a340e7 (patch) | |
| tree | ad9a28c6a555c4e81c8b884135260a097be245fb /x11/accessx | |
| parent | - Fix build on Sparc (diff) | |
Make x11/accessx compile under -current again.
Noticed on: bento
Notes
Notes:
svn path=/head/; revision=71682
Diffstat (limited to 'x11/accessx')
| -rw-r--r-- | x11/accessx/Makefile | 6 | ||||
| -rw-r--r-- | x11/accessx/files/patch-Access.C | 11 | ||||
| -rw-r--r-- | x11/accessx/files/patch-ax.C | 14 | ||||
| -rw-r--r-- | x11/accessx/files/patch-ax.h | 11 |
4 files changed, 37 insertions, 5 deletions
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile index 66488804ce31..52b8a1211a66 100644 --- a/x11/accessx/Makefile +++ b/x11/accessx/Makefile @@ -17,10 +17,12 @@ MAINTAINER= stephen@math.missouri.edu RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 WRKSRC= ${WRKDIR}/accessx +USE_REINPLACE= yes +USE_X_PREFIX= yes pre-build: - ${PERL} -pi.orig -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${X11BASE}/include@g" ${WRKSRC}/Makefile - ${PERL} -pi.orig -e "s@wish -f@wish8.2 -f@g" ${WRKSRC}/accessx + ${REINPLACE_CMD} -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${X11BASE}/include@g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s@wish -f@wish8.2 -f@g" ${WRKSRC}/accessx post-install: strip ${PREFIX}/bin/ax diff --git a/x11/accessx/files/patch-Access.C b/x11/accessx/files/patch-Access.C new file mode 100644 index 000000000000..05b288fdea2a --- /dev/null +++ b/x11/accessx/files/patch-Access.C @@ -0,0 +1,11 @@ +--- Access.C.orig Mon Dec 16 20:35:51 2002 ++++ Access.C Mon Dec 16 20:36:29 2002 +@@ -21,6 +21,8 @@ + #include <X11/XKBlib.h> + #include "Access.h" + ++using namespace std; ++ + // + // Access() + // diff --git a/x11/accessx/files/patch-ax.C b/x11/accessx/files/patch-ax.C index 35823e9cdd5f..53900e49d392 100644 --- a/x11/accessx/files/patch-ax.C +++ b/x11/accessx/files/patch-ax.C @@ -1,6 +1,14 @@ ---- ax.C-orig Tue Mar 13 23:42:10 2001 -+++ ax.C Sun Nov 17 19:26:06 2002 -@@ -713,7 +713,7 @@ +--- ax.C.orig Tue Mar 13 21:42:10 2001 ++++ ax.C Mon Dec 16 20:37:56 2002 +@@ -18,6 +18,7 @@ + + #include "ax.h" + ++using namespace std; + + /////////////////////////////////////////////////////////////////////////////// + // +@@ -713,7 +714,7 @@ /////////////////////////////////////////////////////////////////////////////// diff --git a/x11/accessx/files/patch-ax.h b/x11/accessx/files/patch-ax.h new file mode 100644 index 000000000000..bf25abe98948 --- /dev/null +++ b/x11/accessx/files/patch-ax.h @@ -0,0 +1,11 @@ +--- ax.h.orig Mon Dec 16 20:36:59 2002 ++++ ax.h Mon Dec 16 20:37:06 2002 +@@ -22,7 +22,7 @@ + + // Include Files + +-#include <iostream.h> ++#include <iostream> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> |