Add morse-classic 2.5 to wip

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Add morse-classic 2.5 to wip
From: i3enedek <pkgsrc_git%i3enedek.neomailbox.net@localhost>
Date: Wed, 07 Oct 2015 13:36:17 +0000
Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc_git%i3enedek.neomailbox.net@localhost>
Pushed By:	i3enedek
Date:		Wed Oct 7 14:36:17 2015 +0100
Changeset:	1aaf81571aeb8d8185ce362dc2b758d75bec3070

Modified Files:
	gtkmmorse/Makefile
Added Files:
	morse/DESCR
	morse/Makefile
	morse/PLIST
	morse/TODO
	morse/distinfo
	morse/patches/patch-Makefile
	morse/patches/patch-morse.d_Makefile
	morse/patches/patch-qso.d_Makefile

Log Message:
Add morse-classic 2.5 to wip

also fixing up gtkmmorse/Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1aaf81571aeb8d8185ce362dc2b758d75bec3070

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gtkmmorse/Makefile                   |  3 +-
 morse/DESCR                          |  9 ++++++
 morse/Makefile                       | 33 +++++++++++++++++++
 morse/PLIST                          |  5 +++
 morse/TODO                           |  1 +
 morse/distinfo                       |  8 +++++
 morse/patches/patch-Makefile         | 44 ++++++++++++++++++++++++++
 morse/patches/patch-morse.d_Makefile | 61 ++++++++++++++++++++++++++++++++++++
 morse/patches/patch-qso.d_Makefile   | 19 +++++++++++
 9 files changed, 181 insertions(+), 2 deletions(-)

diffs:
diff --git a/gtkmmorse/Makefile b/gtkmmorse/Makefile
index 2c2db1c..c15c354 100644
--- a/gtkmmorse/Makefile
+++ b/gtkmmorse/Makefile
@@ -7,14 +7,13 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.nongnu.org/gtkmmorse/
-COMMENT=	TODO: Short description of the package
+COMMENT=	Morse Code Trainer
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
-# url2pkg-marker (please do not remove this line.)
 .include "../../devel/gconfmm/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
diff --git a/morse/DESCR b/morse/DESCR
new file mode 100644
index 0000000..58a72fa
--- /dev/null
+++ b/morse/DESCR
@@ -0,0 +1,9 @@
+A morse-code training program and QSO generator.
+
+Morse Classic is a Morse-code training program for aspiring radio hams.
+It can generate random tests or simulated QSOs resembling those used in
+the ARRL test (a QSO generator is included). There are a plethora of
+options to vary the training method.
+
+In one of the simpler modes, this program will take text from standard
+input and render it as Morse-code beeps.
diff --git a/morse/Makefile b/morse/Makefile
new file mode 100644
index 0000000..87d40d9
--- /dev/null
+++ b/morse/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD$
+
+DISTNAME=	morse-2.5
+CATEGORIES=	ham
+MASTER_SITES=	http://www.catb.org/~esr/morse-classic/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://www.catb.org/~esr/morse-classic/
+COMMENT=	Morse-code training program and QSO generator
+LICENSE=	original-bsd
+
+MAKE_FLAGS+=	DEVICE=OSS
+#USE_TOOLS+=	pkg-config
+
+LDFLAGS+=	${LIBOSSAUDIO}
+AUTO_MKDIRS=	yes
+
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	post-patch
+SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_FILES.oss+=	morse.d/beepOSS.c
+SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/morse ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/QSO ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/morse.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/QSO.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${MV} ${DESTDIR}${PREFIX}/bin/morse ${DESTDIR}${PREFIX}/bin/morsec
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/morse.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/morsec.1
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/morse/PLIST b/morse/PLIST
new file mode 100644
index 0000000..acb12b6
--- /dev/null
+++ b/morse/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD$
+bin/QSO
+bin/morsec
+man/man1/QSO.1
+man/man1/morsec.1
diff --git a/morse/TODO b/morse/TODO
new file mode 100644
index 0000000..dd67e4c
--- /dev/null
+++ b/morse/TODO
@@ -0,0 +1 @@
+Add comments to patches and add options for pulse, alsa etc. 
diff --git a/morse/distinfo b/morse/distinfo
new file mode 100644
index 0000000..d6257a9
--- /dev/null
+++ b/morse/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (morse-2.5.tar.gz) = f3b607272e5dc84920e4d3a80d559df0e92ec54b
+RMD160 (morse-2.5.tar.gz) = 6fba9f8ad5c1a24e5ecd760e343c3a5bb4c930b9
+Size (morse-2.5.tar.gz) = 46470 bytes
+SHA1 (patch-Makefile) = f6152b9096f117a095ca57c888c3e40bf1683c0c
+SHA1 (patch-morse.d_Makefile) = 3ab8d335ff8e8655268ac26f758b732e29b2f773
+SHA1 (patch-qso.d_Makefile) = 2432f8668223b9bb16046742f1fd3f28524f8689
diff --git a/morse/patches/patch-Makefile b/morse/patches/patch-Makefile
new file mode 100644
index 0000000..f4c0209
--- /dev/null
+++ b/morse/patches/patch-Makefile
@@ -0,0 +1,44 @@
+$NetBSD$
+
+--- Makefile.orig	2012-11-27 06:52:36.000000000 +0000
++++ Makefile
+@@ -26,7 +26,7 @@
+ #DEVICE = Linux
+ #DEVICE = OSS
+ #DEVICE = ALSA
+-DEVICE = PA
++#DEVICE = PA
+ 
+ VERSION=2.5
+ 
+@@ -42,11 +42,11 @@ default: all
+ all: morse QSO morse.1 QSO.1
+ 
+ morse:
+-	cd morse.d && make DEVICE=${DEVICE}
++	${MAKE} -C morse.d DEVICE=${DEVICE}
+ 	ln morse.d/morse ./morse
+ 
+ QSO:
+-	cd qso.d && make
++	${MAKE} -C qso.d
+ 	ln qso.d/QSO ./QSO
+ 
+ #
+@@ -67,8 +67,8 @@ all:	morse QSO
+ 
+ clean:
+ 	rm -f morse QSO *.1 *.html SHIPPER.*
+-	cd morse.d; make clean
+-	cd qso.d; make clean
++	${MAKE} -C morse.d clean
++	${MAKE} -C qso.d clean
+ 
+ pristine: clean
+ 	rm -f $(MANPAGES) morse.html
+@@ -93,4 +93,4 @@ cppcheck:
+ 
+ 
+ release: morse-$(VERSION).tar.gz morse.html
+-	shipper -u -m -t; make clean
++	shipper -u -m -t; ${MAKE} clean
diff --git a/morse/patches/patch-morse.d_Makefile b/morse/patches/patch-morse.d_Makefile
new file mode 100644
index 0000000..0433e3a
--- /dev/null
+++ b/morse/patches/patch-morse.d_Makefile
@@ -0,0 +1,61 @@
+$NetBSD$
+
+--- morse.d/Makefile.orig	2011-06-04 09:08:38.000000000 +0000
++++ morse.d/Makefile
+@@ -1,40 +1,44 @@
+-DEVICE=PA
++#DEVICE=PA
+ 
+ BEEPERS = beepLinux.c beepOSS.c beepX11.c beepALSA.c
+ SOURCES = alarm.c morse.c alarm.h beep.h $(BEEPERS)
+ 
+ # The flags necessary to link with the X11 libraries.
+-X11LIBS = -L/usr/X11R6/lib -lX11
++X11LIBS = -lX11
+ 
+ # The flags necessary to link with PulseAudio and support pthread
+-PA_CFLAGS = -pthread $(shell pkg-config --cflags libpulse-simple)
+-PA_LIBS = $(shell pkg-config --libs libpulse-simple) -pthread
++PA_CFLAGS = -pthread `pkg-config --cflags libpulse-simple`
++PA_LIBS = `pkg-config --libs libpulse-simple` -pthread
+ 
+ # The flags necessary to link with ALSA
+-ALSA_CFLAGS = $(shell pkg-config --cflags alsa)
+-ALSA_LIBS = $(shell pkg-config --libs alsa)
++ALSA_CFLAGS = `pkg-config --cflags alsa`
++ALSA_LIBS = `shell pkg-config --libs alsa`
+ 
+ # Any additional flags your favorite C compiler requires to work.
+-CFLAGS  = -O3 -I/usr/X11R6/include $($(device)_EXTRA_CFLAGS)
++#CFLAGS  = -O3 -I/usr/X11R6/include $($(device)_EXTRA_CFLAGS)
+ 
+ morse:	morse${DEVICE}
+ 	rm -f $@
+ 	ln morse${DEVICE} $@
+ 
+ morseX11:	morse.o beepX11.o alarm.o
+-	$(CC) $(X11LIBS) -o $@ morse.o beepX11.o alarm.o
++	$(CC) $(X11LIBS) $(LDFLAGS) -o $@ morse.o beepX11.o alarm.o
+ 
+ morseLinux:	morse.o beepLinux.o alarm.o
+-	$(CC) -o $@ morse.o beepLinux.o alarm.o -lm
++	$(CC) $(LDFLAGS) -o $@ morse.o beepLinux.o alarm.o -lm
+ 
+ morseOSS:	morse.o beepOSS.o
+-	$(CC) $(CFLAGS) -o $@ morse.o beepOSS.o -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ morse.o beepOSS.o -lm
++	
++beepPA.o: beepPA.c
++	${CC} ${CFLAGS} ${PA_CFLAGS} -c ${.IMPSRC}
++
+ 
+ morsePA:	morse.o beepPA.o
+-	$(CC) $(CFLAGS) $(PA_CFLAGS) -o $@ morse.o beepPA.o -lm $(PA_LIBS)
++	$(CC) $(CFLAGS) $(PA_CFLAGS) $(LDFLAGS) -o $@ morse.o beepPA.o -lm $(PA_LIBS)
+ 
+ morseALSA:	morse.o beepALSA.o
+-	$(CC) $(CFLAGS) $(ALSA_CFLAGS) -o $@ morse.o beepALSA.o -lm $(ALSA_LIBS)
++	$(CC) $(CFLAGS) $(ALSA_CFLAGS) $(LDFLAGS) -o $@ morse.o beepALSA.o -lm $(ALSA_LIBS)
+ 
+ morse.o:	beep.h Makefile
+ beepX11.o:	beep.h alarm.h
diff --git a/morse/patches/patch-qso.d_Makefile b/morse/patches/patch-qso.d_Makefile
new file mode 100644
index 0000000..11be5a1
--- /dev/null
+++ b/morse/patches/patch-qso.d_Makefile
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- qso.d/Makefile.orig	2010-10-13 05:11:39.000000000 +0000
++++ qso.d/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS  = -O3
++#CFLAGS  = -O3
+ 
+ OBJECTS = QSO.o put_form.o make_fre.o grammar.o util.o init_str.o
+ INCLUDES = antenna.h callsign.h city.h cityh.h heights.h jobs.h misc.h \
+@@ -7,7 +7,7 @@ INCLUDES = antenna.h callsign.h city.h c
+ all:	QSO
+ 
+ QSO:	$(OBJECTS)
+-	$(CC) -o $@ $(OBJECTS)
++	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJECTS)
+ 
+ init_str.o:	$(INCLUDES)
+
Prev by Date: Fixed wip/qrq and updated it to qrq-0.3.1
Next by Date: new package import: py-django-markwhat
Previous by Thread: Fixed wip/qrq and updated it to qrq-0.3.1
Next by Thread: new package import: py-django-markwhat
Indexes:
Home | Main Index | Thread Index | Old Index