diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-19 18:57:40 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-19 18:57:40 +0000 |
| commit | e5587f8a2bbbf2c319bdbcfafe28f188e5768eaf (patch) | |
| tree | ce7e6a73b8656168ea60e54312dc037f52f7638b /emulators/dtcyber | |
| parent | 7e345212991a07b7655ca8fe5f8ffae9e76b01ca (diff) | |
Notes
Diffstat (limited to 'emulators/dtcyber')
| -rw-r--r-- | emulators/dtcyber/Makefile | 7 | ||||
| -rw-r--r-- | emulators/dtcyber/files/patch-Makefile.x11 | 27 |
2 files changed, 29 insertions, 5 deletions
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile index 66230264bcdd..1a5142553102 100644 --- a/emulators/dtcyber/Makefile +++ b/emulators/dtcyber/Makefile @@ -18,15 +18,12 @@ USE_XORG= x11 NO_WRKSUBDIR= yes INSTALL_TARGET= MAKEFILE= Makefile.x11 +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message PLIST_FILES= bin/dtcyber %%EXAMPLESDIR%%/cyber.ini %%EXAMPLESDIR%%/cos.tap -pre-patch: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|CFLAGS = -O2|CFLAGS+= |' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.x11 - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dtcyber ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/emulators/dtcyber/files/patch-Makefile.x11 b/emulators/dtcyber/files/patch-Makefile.x11 new file mode 100644 index 000000000000..63313dae3535 --- /dev/null +++ b/emulators/dtcyber/files/patch-Makefile.x11 @@ -0,0 +1,27 @@ +--- Makefile.x11.orig 2015-03-19 18:46:41 UTC ++++ Makefile.x11 +@@ -9,14 +9,8 @@ + # + #-------------------------------------------------------------------------- + +-#LIBS = -lm -lX11 -lpthreads + LIBS = -lm -lX11 -lpthread +-#LIBS = -lm -lX11 +-LDFLAGS = -s -L/usr/X11R6/lib +-INCL = -I/usr/X11R6/include +- +-#CFLAGS = -O2 -I. $(INCL) -Wall -Wshadow -Wpointer-arith -Wmissing-prototypes +-CFLAGS = -O2 -I. $(INCL) ++CFLAGS+= -I. + + OBJS = main.o window_x11.o init.o trace.o charset.o dump.o \ + device.o channel.o cpu.o pp.o float.o shift.o operator.o \ +@@ -26,7 +20,7 @@ OBJS = main.o window_x11.o init.o tra + dtcyber: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + +-all: clean dtcyber ++all: dtcyber + + clean: + rm -f *.o |