SF.net SVN: gar:[24089] csw/mgar/pkg

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Sep 13 07:45:05 CEST 2014


Revision: 24089
          http://sourceforge.net/p/gar/code/24089
Author:   wahwah
Date:     2014-09-13 05:45:03 +0000 (Sat, 13 Sep 2014)
Log Message:
-----------
abcm2ps/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/abcm2ps/
    csw/mgar/pkg/abcm2ps/Makefile
    csw/mgar/pkg/abcm2ps/branches/
    csw/mgar/pkg/abcm2ps/tags/
    csw/mgar/pkg/abcm2ps/trunk/
    csw/mgar/pkg/abcm2ps/trunk/Makefile
    csw/mgar/pkg/abcm2ps/trunk/checksums
    csw/mgar/pkg/abcm2ps/trunk/files/
    csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch
    csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch

Added: csw/mgar/pkg/abcm2ps/Makefile
===================================================================
--- csw/mgar/pkg/abcm2ps/Makefile	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/Makefile	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*

Index: csw/mgar/pkg/abcm2ps/trunk
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk	2014-09-12 15:01:17 UTC (rev 24088)
+++ csw/mgar/pkg/abcm2ps/trunk	2014-09-13 05:45:03 UTC (rev 24089)

Property changes on: csw/mgar/pkg/abcm2ps/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/abcm2ps/trunk/Makefile
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/Makefile	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,53 @@
+# $Id$
+
+NAME = abcm2ps
+VERSION = 8.2.1
+GARTYPE = v2
+
+DESCRIPTION = Convert ABC to music sheet in PostScript or SVG
+
+VENDOR_URL = http://moinejf.free.fr/
+
+MASTER_SITES = http://moinejf.free.fr/
+DISTFILES  = $(DISTNAME).tar.gz
+
+# abcm2ps comes with homegrown configure script and Makefile. Following
+# patchset replaces this with simple autotools build. Upstream author (J-FM)
+# wasn't interested in merging this change, most likely due to perceived
+# complexity of autotools.
+#
+# As a result, maintaining this package will suck. Every time upstream changes
+# their build script, this patch will stop applying cleanly and you'll need to
+# figure out what has changed and adjust autotools patch. Alternatively, you
+# can try modifying original homegrown build system to work with Solaris or
+# convince upstream author to merge this patch. Both of those have been
+# attempted before, and failed. You have been warned.
+#
+# --Maciej, 2014-09-12
+
+PATCHFILES += 0001-Remove-custom-Makefile.patch
+PATCHFILES += 0002-Remove-the-custom-Makefile.in-and-config.h.in.patch
+PATCHFILES += 0003-Remove-the-custom-config.h.patch
+PATCHFILES += 0004-Remove-configure.patch
+PATCHFILES += 0005-Add-a-smoke-test.patch
+PATCHFILES += 0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch
+PATCHFILES += 0007-Add-Makefile.am-and-configure.ac.patch
+PATCHFILES += 0008-Add-standard-GNU-project-files.patch
+
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangocairo1-0-0
+
+include gar/category.mk
+
+pre-configure:
+	(cd $(WORKSRC); autoreconf -fi)
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/abcm2ps/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/abcm2ps/trunk/checksums
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/checksums	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1 @@
+160e5d57328b61b95336f360ee7a09f4  abcm2ps-8.2.1.tar.gz

Added: csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,167 @@
+From 71749412c686ba60930cc47b30514071ae4ae937 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 12 Sep 2014 01:49:56 +0200
+Subject: [PATCH 1/8] Remove custom Makefile
+
+---
+ Makefile | 148 ---------------------------------------------------------------
+ 1 file changed, 148 deletions(-)
+ delete mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index 9ad34d5..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,148 +0,0 @@
+-# Makefile source for abcm2ps
+-
+-VERSION = 8.2.1
+-
+-CC = gcc
+-INSTALL = /usr/bin/install -c
+-INSTALL_DATA = ${INSTALL} -m 644
+-INSTALL_PROGRAM = ${INSTALL}
+-
+-CPPFLAGS =  -I.
+-CPPPANGO = 
+-CFLAGS = -g -O2 -Wall -pipe
+-LDFLAGS =  -lm
+-
+-prefix = /usr/local
+-exec_prefix = ${prefix}
+-
+-srcdir = .
+-VPATH = .
+-bindir = ${exec_prefix}/bin
+-libdir = ${exec_prefix}/lib
+-datadir = ${prefix}/share
+-docdir = ${prefix}/doc
+-
+-# unix
+-OBJECTS=abc2ps.o \
+-	abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \
+-	slre.o subs.o svg.o syms.o
+-abcm2ps: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS)
+-
+-$(OBJECTS): abcparse.h config.h Makefile
+-abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \
+-	subs.o svg.o syms.o: abc2ps.h
+-abc2ps.o front.o: front.h
+-front.o parse.o slre.o: slre.h
+-subs.o: subs.c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $<
+-
+-abcmfe: front.c front.h slre.h
+-	$(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o
+-
+-DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt)
+-
+-install: abcm2ps
+-	mkdir -p $(bindir); \
+-	mkdir -p $(datadir)/abcm2ps; \
+-	mkdir -p $(docdir)/abcm2ps; \
+-	$(INSTALL_PROGRAM) abcm2ps $(bindir)
+-	for f in $(srcdir)/*.fmt; do \
+-		$(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
+-	done
+-	for f in $(DOCFILES); do \
+-		$(INSTALL_DATA) $$f $(docdir)/abcm2ps; \
+-	done
+-
+-uninstall:
+-	echo "uninstalling..."; \
+-	rm -f $(bindir)/abcm2ps; \
+-	rm -rf $(datadir)/abcm2ps; \
+-	rm -rf $(docdir)/abcm2ps
+-
+-DIST_FILES = \
+-	abcm2ps-$(VERSION)/Changes \
+-	abcm2ps-$(VERSION)/INSTALL \
+-	abcm2ps-$(VERSION)/Makefile \
+-	abcm2ps-$(VERSION)/Makefile.in \
+-	abcm2ps-$(VERSION)/README \
+-	abcm2ps-$(VERSION)/abc2ps.c \
+-	abcm2ps-$(VERSION)/abc2ps.h \
+-	abcm2ps-$(VERSION)/abcparse.c \
+-	abcm2ps-$(VERSION)/abcparse.h \
+-	abcm2ps-$(VERSION)/accordion.abc \
+-	abcm2ps-$(VERSION)/build.ninja \
+-	abcm2ps-$(VERSION)/buffer.c \
+-	abcm2ps-$(VERSION)/chinese.abc \
+-	abcm2ps-$(VERSION)/configure \
+-	abcm2ps-$(VERSION)/config.h \
+-	abcm2ps-$(VERSION)/config.h.in \
+-	abcm2ps-$(VERSION)/deco.c \
+-	abcm2ps-$(VERSION)/deco.abc \
+-	abcm2ps-$(VERSION)/draw.c \
+-	abcm2ps-$(VERSION)/features.txt \
+-	abcm2ps-$(VERSION)/flute.fmt \
+-	abcm2ps-$(VERSION)/format.c \
+-	abcm2ps-$(VERSION)/format.txt \
+-	abcm2ps-$(VERSION)/front.c \
+-	abcm2ps-$(VERSION)/front.h \
+-	abcm2ps-$(VERSION)/glyph.c \
+-	abcm2ps-$(VERSION)/landscape.fmt \
+-	abcm2ps-$(VERSION)/music.c \
+-	abcm2ps-$(VERSION)/musicfont.fmt \
+-	abcm2ps-$(VERSION)/newfeatures.abc \
+-	abcm2ps-$(VERSION)/options.txt \
+-	abcm2ps-$(VERSION)/parse.c \
+-	abcm2ps-$(VERSION)/sample.abc \
+-	abcm2ps-$(VERSION)/sample2.abc \
+-	abcm2ps-$(VERSION)/sample3.abc \
+-	abcm2ps-$(VERSION)/sample3.eps \
+-	abcm2ps-$(VERSION)/sample4.abc \
+-	abcm2ps-$(VERSION)/sample5.abc \
+-	abcm2ps-$(VERSION)/sample8.html \
+-	abcm2ps-$(VERSION)/slre.c \
+-	abcm2ps-$(VERSION)/slre.h \
+-	abcm2ps-$(VERSION)/subs.c \
+-	abcm2ps-$(VERSION)/svg.c \
+-	abcm2ps-$(VERSION)/syms.c \
+-	abcm2ps-$(VERSION)/voices.abc
+-
+-dist: Changes
+-	ln -s . abcm2ps-$(VERSION); \
+-	tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \
+-	rm abcm2ps-$(VERSION)
+-
+-zip-dist:
+-	ln -s . abcm2ps-$(VERSION); \
+-	zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \
+-	rm abcm2ps-$(VERSION)
+-
+-zip: abcm2ps.exe
+-	strip abcm2ps.exe; \
+-	cd ..; zip -r abcm2ps-$(VERSION).zip \
+-	abcm2ps-$(VERSION)/abcm2ps.exe \
+-	abcm2ps-$(VERSION)/License \
+-	abcm2ps-$(VERSION)/Changes \
+-	abcm2ps-$(VERSION)/INSTALL \
+-	abcm2ps-$(VERSION)/sample3.eps \
+-	abcm2ps-$(VERSION)/*.abc \
+-	abcm2ps-$(VERSION)/*.fmt \
+-	abcm2ps-$(VERSION)/*.txt ; cd -
+-
+-EXAMPLES = accordion.ps \
+-	chinese.ps \
+-	deco.ps \
+-	newfeatures.ps \
+-	sample.ps \
+-	sample2.ps \
+-	sample3.ps \
+-	sample4.ps \
+-	sample5.ps \
+-	voices.ps
+-
+-test:	$(EXAMPLES)
+-%.ps: %.abc
+-	./abcm2ps -O $@ $<
+-
+-clean:
+-	rm -f *.o $(EXAMPLES) # *.obj
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,191 @@
+From 8e6806ec225a43eb49d0253dc4d14b9685c08a02 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:32:26 +0100
+Subject: [PATCH 2/8] Remove the custom Makefile.in and config.h.in
+
+---
+ Makefile.in | 148 ------------------------------------------------------------
+ config.h.in |  16 -------
+ 2 files changed, 164 deletions(-)
+ delete mode 100644 Makefile.in
+ delete mode 100644 config.h.in
+
+diff --git a/Makefile.in b/Makefile.in
+deleted file mode 100644
+index d9f01fe..0000000
+--- a/Makefile.in
++++ /dev/null
+@@ -1,148 +0,0 @@
+-# Makefile source for abcm2ps
+-
+-VERSION = @VERSION@
+-
+-CC = @CC@
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-
+-CPPFLAGS = @CPPFLAGS@ -I.
+-CPPPANGO = @CPPPANGO@
+-CFLAGS = @CFLAGS@
+-LDFLAGS = @LDFLAGS@ -lm
+-
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-srcdir = @srcdir@
+-VPATH = @srcdir@
+-bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datarootdir@
+-docdir = @docdir@
+-
+-# unix
+-OBJECTS=abc2ps.o \
+-	abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \
+-	slre.o subs.o svg.o syms.o
+-abcm2ps: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS)
+-
+-$(OBJECTS): abcparse.h config.h Makefile
+-abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \
+-	subs.o svg.o syms.o: abc2ps.h
+-abc2ps.o front.o: front.h
+-front.o parse.o slre.o: slre.h
+-subs.o: subs.c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $<
+-
+-abcmfe: front.c front.h slre.h
+-	$(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o
+-
+-DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt)
+-
+-install: abcm2ps
+-	mkdir -p $(bindir); \
+-	mkdir -p $(datadir)/abcm2ps; \
+-	mkdir -p $(docdir)/abcm2ps; \
+-	$(INSTALL_PROGRAM) abcm2ps $(bindir)
+-	for f in $(srcdir)/*.fmt; do \
+-		$(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
+-	done
+-	for f in $(DOCFILES); do \
+-		$(INSTALL_DATA) $$f $(docdir)/abcm2ps; \
+-	done
+-
+-uninstall:
+-	echo "uninstalling..."; \
+-	rm -f $(bindir)/abcm2ps; \
+-	rm -rf $(datadir)/abcm2ps; \
+-	rm -rf $(docdir)/abcm2ps
+-
+-DIST_FILES = \
+-	abcm2ps-$(VERSION)/Changes \
+-	abcm2ps-$(VERSION)/INSTALL \
+-	abcm2ps-$(VERSION)/Makefile \
+-	abcm2ps-$(VERSION)/Makefile.in \
+-	abcm2ps-$(VERSION)/README \
+-	abcm2ps-$(VERSION)/abc2ps.c \
+-	abcm2ps-$(VERSION)/abc2ps.h \
+-	abcm2ps-$(VERSION)/abcparse.c \
+-	abcm2ps-$(VERSION)/abcparse.h \
+-	abcm2ps-$(VERSION)/accordion.abc \
+-	abcm2ps-$(VERSION)/build.ninja \
+-	abcm2ps-$(VERSION)/buffer.c \
+-	abcm2ps-$(VERSION)/chinese.abc \
+-	abcm2ps-$(VERSION)/configure \
+-	abcm2ps-$(VERSION)/config.h \
+-	abcm2ps-$(VERSION)/config.h.in \
+-	abcm2ps-$(VERSION)/deco.c \
+-	abcm2ps-$(VERSION)/deco.abc \
+-	abcm2ps-$(VERSION)/draw.c \
+-	abcm2ps-$(VERSION)/features.txt \
+-	abcm2ps-$(VERSION)/flute.fmt \
+-	abcm2ps-$(VERSION)/format.c \
+-	abcm2ps-$(VERSION)/format.txt \
+-	abcm2ps-$(VERSION)/front.c \
+-	abcm2ps-$(VERSION)/front.h \
+-	abcm2ps-$(VERSION)/glyph.c \
+-	abcm2ps-$(VERSION)/landscape.fmt \
+-	abcm2ps-$(VERSION)/music.c \
+-	abcm2ps-$(VERSION)/musicfont.fmt \
+-	abcm2ps-$(VERSION)/newfeatures.abc \
+-	abcm2ps-$(VERSION)/options.txt \
+-	abcm2ps-$(VERSION)/parse.c \
+-	abcm2ps-$(VERSION)/sample.abc \
+-	abcm2ps-$(VERSION)/sample2.abc \
+-	abcm2ps-$(VERSION)/sample3.abc \
+-	abcm2ps-$(VERSION)/sample3.eps \
+-	abcm2ps-$(VERSION)/sample4.abc \
+-	abcm2ps-$(VERSION)/sample5.abc \
+-	abcm2ps-$(VERSION)/sample8.html \
+-	abcm2ps-$(VERSION)/slre.c \
+-	abcm2ps-$(VERSION)/slre.h \
+-	abcm2ps-$(VERSION)/subs.c \
+-	abcm2ps-$(VERSION)/svg.c \
+-	abcm2ps-$(VERSION)/syms.c \
+-	abcm2ps-$(VERSION)/voices.abc
+-
+-dist: Changes
+-	ln -s . abcm2ps-$(VERSION); \
+-	tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \
+-	rm abcm2ps-$(VERSION)
+-
+-zip-dist:
+-	ln -s . abcm2ps-$(VERSION); \
+-	zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \
+-	rm abcm2ps-$(VERSION)
+-
+-zip: abcm2ps.exe
+-	strip abcm2ps.exe; \
+-	cd ..; zip -r abcm2ps-$(VERSION).zip \
+-	abcm2ps-$(VERSION)/abcm2ps.exe \
+-	abcm2ps-$(VERSION)/License \
+-	abcm2ps-$(VERSION)/Changes \
+-	abcm2ps-$(VERSION)/INSTALL \
+-	abcm2ps-$(VERSION)/sample3.eps \
+-	abcm2ps-$(VERSION)/*.abc \
+-	abcm2ps-$(VERSION)/*.fmt \
+-	abcm2ps-$(VERSION)/*.txt ; cd -
+-
+-EXAMPLES = accordion.ps \
+-	chinese.ps \
+-	deco.ps \
+-	newfeatures.ps \
+-	sample.ps \
+-	sample2.ps \
+-	sample3.ps \
+-	sample4.ps \
+-	sample5.ps \
+-	voices.ps
+-
+-test:	$(EXAMPLES)
+-%.ps: %.abc
+-	./abcm2ps -O $@ $<
+-
+-clean:
+-	rm -f *.o $(EXAMPLES) # *.obj
+diff --git a/config.h.in b/config.h.in
+deleted file mode 100644
+index 650eee1..0000000
+--- a/config.h.in
++++ /dev/null
+@@ -1,16 +0,0 @@
+-/* config.h.in */
+-
+-/* uncomment to handle the european A4 format.  */
+-//#define A4_FORMAT 1
+-
+-/* uncomment to have ~ as roll instead of twiddle.  */
+-//#define DECO_IS_ROLL 1
+-
+-/* comment if you have not mmap() */
+-#define HAVE_MMAP 1
+-
+-/* default directory to search for format files */
+-#define DEFAULT_FDIR xxx
+-
+-#define VERSION xxx
+-#define VDATE xxx
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,35 @@
+From 11a50a6a7d2a0dca42204611b64e9ca9c0794cf6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:32:41 +0100
+Subject: [PATCH 3/8] Remove the custom config.h
+
+---
+ config.h | 16 ----------------
+ 1 file changed, 16 deletions(-)
+ delete mode 100644 config.h
+
+diff --git a/config.h b/config.h
+deleted file mode 100644
+index 9c82344..0000000
+--- a/config.h
++++ /dev/null
+@@ -1,16 +0,0 @@
+-/* config.h.in */
+-
+-/* uncomment to handle the european A4 format.  */
+-//#define A4_FORMAT 1
+-
+-/* uncomment to have ~ as roll instead of twiddle.  */
+-//#define DECO_IS_ROLL 1
+-
+-/* comment if you have not mmap() */
+-#define HAVE_MMAP 1
+-
+-/* default directory to search for format files */
+-#define DEFAULT_FDIR "/usr/local/share/abcm2ps"
+-
+-#define VERSION "8.2.1"
+-#define VDATE "September 3, 2014"
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,94 @@
+From 8d373e7d60b5c19571629df9e38f8222d2d80ee3 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 12 Sep 2014 02:45:34 +0200
+Subject: [PATCH 4/8] Remove configure
+
+---
+ configure | 75 ---------------------------------------------------------------
+ 1 file changed, 75 deletions(-)
+ delete mode 100755 configure
+
+diff --git a/configure b/configure
+deleted file mode 100755
+index adbc44a..0000000
+--- a/configure
++++ /dev/null
+@@ -1,75 +0,0 @@
+-#! /bin/sh
+-
+-### custom variables ###
+-
+-CC=gcc
+-CFLAGS="-g -O2 -Wall -pipe"
+-
+-INSTALL="/usr/bin/install -c"
+-INSTALL_DATA='${INSTALL} -m 644'
+-INSTALL_PROGRAM='${INSTALL}'
+-
+-prefix=/usr/local
+-exec_prefix='${prefix}'
+-srcdir=.
+-bindir='${exec_prefix}/bin'
+-libdir='${exec_prefix}/lib'
+-datarootdir='${prefix}/share'
+-docdir='${prefix}/doc'
+-DEFAULT_FDIR="$prefix/share/abcm2ps"
+-
+-### custom end ###
+-
+-if test -f ./custom; then
+-	. ./custom
+-fi
+-
+-VERSION=8.2.1
+-VDATE='September 3, 2014'
+-
+-case "$1" in
+-	--*=*)
+-		cmd=${1#--}
+-		eval $cmd
+-		;;
+-esac
+-
+-if which pkg-config > /dev/null ; then
+-	if pkg-config --exists freetype2 ; then
+-		if pkg-config --exists pangocairo ; then
+-			CPPFLAGS="-DHAVE_PANGO=1"
+-			CPPPANGO="`pkg-config pango cairo freetype2 --cflags`"
+-			LDFLAGS="$LDFLAGS `pkg-config pangocairo pangoft2 freetype2 --libs`"
+-		else
+-			echo "pangocairo not found - no pango support"
+-		fi
+-	else
+-		echo "freetype2 not found - no pango support"
+-	fi
+-else
+-	echo "pkg-config not found - no pango support"
+-fi
+-
+-sed "s+ at CC@+$CC+
+-s+ at CPPFLAGS@+$CPPFLAGS+
+-s+ at CPPPANGO@+$CPPPANGO+
+-s+ at CFLAGS@+$CFLAGS+
+-s+ at LDFLAGS@+$LDFLAGS+
+-s+ at INSTALL@+$INSTALL+
+-s+ at INSTALL_DATA@+$INSTALL_DATA+
+-s+ at INSTALL_PROGRAM@+$INSTALL_PROGRAM+
+-s+ at prefix@+$prefix+
+-s+ at exec_prefix@+$exec_prefix+
+-s+ at srcdir@+$srcdir+
+-s+ at bindir@+$bindir+
+-s+ at libdir@+$libdir+
+-s+ at datarootdir@+$datarootdir+
+-s+ at docdir@+$docdir+
+-s+ at VERSION@+$VERSION+" Makefile.in > Makefile
+-echo "Makefile created"
+-
+-sed "s/define VERSION xxx/\define VERSION \"$VERSION\"/
+-s/define VDATE xxx/define VDATE \"$VDATE\"/
+-s+define DEFAULT_FDIR xxx+define DEFAULT_FDIR \"$DEFAULT_FDIR\"+
+-" config.h.in > config.h
+-echo "config.h created"
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,43 @@
+From e67c0b024e7303027ee701c6fc578de4908ca288 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:26:55 +0100
+Subject: [PATCH 5/8] Add a smoke test.
+
+---
+ smoketest.sh | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100755 smoketest.sh
+
+diff --git a/smoketest.sh b/smoketest.sh
+new file mode 100755
+index 0000000..f1b2bac
+--- /dev/null
++++ b/smoketest.sh
+@@ -0,0 +1,24 @@
++#!/bin/bash
++
++set -e
++
++FILES=(
++  accordion
++  chinese
++  deco
++  newfeatures
++  sample
++  sample2
++  sample3
++  sample4
++  sample5
++  voices
++)
++
++for f in ${FILES[@]}; do
++  ./abcm2ps -O "${f}.ps" "${f}.abc"
++  rm -f "${f}.ps"
++done
++
++echo PASS
++exit 0
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,26 @@
+From 800c809cabd225881c7015ea304e086045e37656 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:26:28 +0100
+Subject: [PATCH 6/8] subs.c includes config.h to get HAVE_PANGO
+
+---
+ subs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/subs.c b/subs.c
+index 3ff6163..21ac637 100644
+--- a/subs.c
++++ b/subs.c
+@@ -27,6 +27,9 @@
+ #include <time.h>
+ #include <string.h>
+ #include <ctype.h>
++
++#include "config.h"  /* for HAVE_PANGO */
++
+ #ifdef HAVE_PANGO
+ #include <pango/pangocairo.h>
+ #include <pango/pangofc-font.h>
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,127 @@
+From a6c029c905ba969d279c9874aa1324e40e125586 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:29:57 +0100
+Subject: [PATCH 7/8] Add Makefile.am and configure.ac
+
+Sources used:
+http://www.gnu.org/software/automake/manual/automake.html
+https://www.flameeyes.eu/autotools-mythbuster/
+
+DEFAULT_FDIR is no longer necessary because --datadir can be used instead, and
+.fmt files will be put in the ${pkgdatadir}/abcm2ps directory.
+---
+ Makefile.am  | 34 ++++++++++++++++++++++++++++++++++
+ configure.ac | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 94 insertions(+)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..b441095
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,34 @@
++bin_PROGRAMS = abcm2ps
++abcm2ps_SOURCES = abc2ps.h abcparse.h front.h slre.h \
++									abc2ps.c abcparse.c buffer.c deco.c draw.c format.c front.c \
++									glyph.c music.c parse.c slre.c subs.c svg.c syms.c
++
++abcm2ps_CPPFLAGS = $(PANGO_CFLAGS)
++abcm2ps_LDADD = $(PANGO_LIBS)
++
++abcm2ps_CPPFLAGS += $(CAIRO_CFLAGS)
++abcm2ps_LDADD += $(CAIRO_LIBS)
++
++abcm2ps_CPPFLAGS += $(PANGOCAIRO_CFLAGS)
++abcm2ps_LDADD += $(PANGOCAIRO_LIBS)
++
++abcm2ps_CPPFLAGS += $(PANGOFT2_CFLAGS)
++abcm2ps_LDADD += $(PANGOFT2_LIBS)
++
++abcm2ps_CPPFLAGS += $(GOBJECT_CFLAGS)
++abcm2ps_LDADD += $(GOBJECT_LIBS)
++
++# for SVG
++abcm2ps_LDADD += -lm
++
++dist_doc_DATA = README ChangeLog NEWS *.abc *.eps *.txt
++dist_pkgdata_DATA = *.fmt
++
++# Requires slre
++# bin_PROGRAMS += abcmfe
++# abcmfe_SOURCES = front.c front.h slre.h
++# abcmfe_CPPFLAGS = -DMAIN
++
++TESTS = smoketest.sh
++
++EXTRA_DIST = $(TESTS)
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..01a787d
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,60 @@
++dnl Configure source for abcm2ps -*- sh -*-
++dnl Copyright (C) 2001-2014 JF Moine.
++
++AC_PREREQ(2.59)
++AC_INIT([abcm2ps], [8.2.2])
++
++AM_INIT_AUTOMAKE([1.11 silent-rules])
++
++VDATE='August 9, 2014'
++
++dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++
++AC_CONFIG_HEADER([config.h])
++
++dnl Checks for header files.
++AC_HEADER_STDC
++AC_CHECK_HEADER([malloc.h])
++
++PKG_PROG_PKG_CONFIG
++
++dnl Check for options
++AC_ARG_ENABLE(pango,
++[  --enable-pango          Use pango if available [[default: yes]]],
++[checkpango="$enableval"],
++[checkpango="yes"])
++
++AS_IF([test "x$checkpango" = "xyes"], [
++  PKG_CHECK_MODULES(PANGO, [pango])
++  PKG_CHECK_MODULES(CAIRO, [cairo])
++  PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo])
++  PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
++  PKG_CHECK_MODULES(PANGOFT2, [pangoft2])
++  # Additional check to see if we can link.
++  AC_SEARCH_LIBS([pango_version], [pango-1.0],
++                 AC_DEFINE([HAVE_PANGO], [1], [Use the Pango library]),
++                 AC_MSG_ERROR([Unable to find the pango-1.0 library.]))
++])
++
++AC_ARG_ENABLE(a4,
++[  --enable-a4             Handle european A4 format instead of default US letter],
++[if test "$enableval" = "yes"; then
++  AC_DEFINE([A4_FORMAT], [], [Handle the A4 format])dnl
++fi])
++
++AC_ARG_ENABLE(deco-is-roll,
++[  --enable-deco-is-roll   Have ~ as roll instead of twiddle],
++[if test "$enableval" = "yes"; then
++  AC_DEFINE([DECO_IS_ROLL], [], [Have ~ as roll instead of twiddle])dnl
++fi])
++
++dnl Build characteristics
++AC_SUBST(CPPPANGO)
++
++AC_DEFINE_UNQUOTED([VDATE], ["$VDATE"], [Date of last modifications])
++AC_DEFINE([DEFAULT_FDIR], ["$pkgdatadir"], [Location of .fmt files])
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
+-- 
+2.0.3
+

Added: csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch
===================================================================
--- csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch	                        (rev 0)
+++ csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch	2014-09-13 05:45:03 UTC (rev 24089)
@@ -0,0 +1,39 @@
+From 81fe0f0a9737478df1a9652f26ce207f6bc06654 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej.blizinski at gmail.com>
+Date: Wed, 3 Sep 2014 22:25:01 +0100
+Subject: [PATCH 8/8] Add standard GNU project files.
+
+AUTHORS
+ChangeLog (symlink to Changes)
+NEWS
+---
+ AUTHORS   | 2 ++
+ ChangeLog | 1 +
+ NEWS      | 0
+ 3 files changed, 3 insertions(+)
+ create mode 100644 AUTHORS
+ create mode 120000 ChangeLog
+ create mode 100644 NEWS
+
+diff --git a/AUTHORS b/AUTHORS
+new file mode 100644
+index 0000000..25f0b08
+--- /dev/null
++++ b/AUTHORS
+@@ -0,0 +1,2 @@
++abc2ps was developped by Michael Methfessel:
++abcm2ps by moinejf (at) free (dot) fr
+diff --git a/ChangeLog b/ChangeLog
+new file mode 120000
+index 0000000..c38de3d
+--- /dev/null
++++ b/ChangeLog
+@@ -0,0 +1 @@
++Changes
+\ No newline at end of file
+diff --git a/NEWS b/NEWS
+new file mode 100644
+index 0000000..e69de29
+-- 
+2.0.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list