mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

comms/xmorse: Fix build on F10+, support stage

Browse Source 
PR:		ports/185398
Submitted by:	Stephan Hurd
Fixed by:	marino@
This commit is contained in:
John Marino 2014-01-25 09:28:51 +00:00
parent e275f8d7de
commit 5d2bf00922
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=341000
6 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comms/xmorse/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= xmorse
PORTVERSION= 20041125
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= comms hamradio
MASTER_SITES= http://c2.com/morse/files/SourceCode/ \
http://www.525183.com/freebsd/xmorse/ \
@ -21,6 +21,9 @@ USE_SDL= sdl
PLIST_FILES= bin/xmorse
NO_WRKSUBDIR= yes
MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
post-patch:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
NO_STAGE= yes
.include <bsd.port.mk>

22
comms/xmorse/files/Makefile Normal file
View File

@ -0,0 +1,22 @@
# $FreeBSD$
CXXFLAGS+= -MMD `fltk-config --cxxflags` `sdl-config --cflags`
PREFIX ?= /usr/local
INSTALL_PROGRAM ?= ${INSTALL} -o root -g wheel -m 755
all: xmorse
m.cxx: m.fl
fluid -c m.fl
xmorse: m.o Bargraph.o Codebox.o Cw.o Knob.o
${CXX} -o$@ $> `fltk-config --ldflags` `sdl-config --libs`
install: xmorse
${INSTALL_PROGRAM} xmorse ${PREFIX}/bin/xmorse
clean:
-rm *.o
-rm *.d
-rm m.cxx m.h
-rm xmorse

11
comms/xmorse/files/patch-Bargraph.cxx Normal file
View File

@ -0,0 +1,11 @@
--- Bargraph.cxx.orig 2004-08-25 17:18:01.000000000 -0700
+++ Bargraph.cxx 2014-01-01 10:26:23.000000000 -0800
@@ -82,7 +82,7 @@
if (child(i)->visible()) nd++;
int dx = w()/nd; // Slider horizontal "period"
int width = dx*nd - gap; // Width of slider array
- int x0 = w()-width >> 1; // Inset to 1st slider
+ int x0 = (w()-width) >> 1; // Inset to 1st slider
width = dx-gap; // Width of individual Slider
for (int i = 0; i < children(); i++) { // Loop to reposition sliders
Fl_Slider* s = (Fl_Slider*) child(i); // Pointer to this Slider

11
comms/xmorse/files/patch-Help.h Normal file
View File

@ -0,0 +1,11 @@
--- Help.h.orig 2014-01-01 10:24:05.000000000 -0800
+++ Help.h 2014-01-01 10:24:10.000000000 -0800
@@ -2,7 +2,7 @@
* generated from the original HTML file by the script, help.py.
*/
-static char* HelpString =
+static const char* HelpString =
"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
"<html>\n"
"<head>\n"

28
comms/xmorse/files/patch-Makefile
View File

@ -1,28 +0,0 @@
--- ./Makefile.orig 2004-09-29 22:12:16.000000000 +0000
+++ ./Makefile 2007-11-24 19:55:15.000000000 +0000
@@ -36,6 +36,25 @@
strip m
rm *.o m.cxx m.h
+# Regular "make" is what you want for the FreeBSD version
+
+all: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
+ Knob.cxx Knob.h Help.h m.fl
+ fluid -c m.fl
+ g++ -c -Os `fltk-config --cxxflags` m.cxx
+ g++ -c -Os `fltk-config --cxxflags` Bargraph.cxx
+ g++ -c -Os `fltk-config --cxxflags` Codebox.cxx
+ g++ -c -Os `fltk-config --cxxflags` Knob.cxx
+ g++ -c -Os `sdl-config --cflags` Cw.cxx
+ g++ -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
+ `sdl-config --static-libs` \
+ `fltk-config --ldstaticflags`
+ strip m
+ rm *.o m.cxx m.h
+
+install: m
+ ${INSTALL} -o root -g wheel -m 0555 m ${PREFIX}/bin/xmorse
+
# Besemer's Python extension version
cw.so: cw.pyx Cw.cxx Cw.h

22
comms/xmorse/files/patch-m.fl
View File

@ -1,5 +1,23 @@
--- m.fl.orig 2011-07-17 14:56:20.000000000 -0400
+++ m.fl 2011-07-17 14:56:31.000000000 -0400
--- m.fl.orig 2004-08-13 16:38:24.000000000 -0700
+++ m.fl 2014-01-01 10:25:10.000000000 -0800
@@ -188,7 +188,7 @@
}
menuitem {} {
label Numbers
- callback {char* nrs = "0123456789";
+ callback {const char* nrs = "0123456789";
if (o->mvalue()->value())
Lesson->enable(nrs);
else
@@ -199,7 +199,7 @@
}
menuitem {} {
label Symbols
- callback {char* syms = "./=?";
+ callback {const char* syms = "./=?";
if (o->mvalue()->value())
Lesson->enable(syms);
else
@@ -231,7 +231,7 @@
}
}