3 files changed, 25 insertions, 47 deletions

diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index 05be4df3f67e..ec6a7e4a9ad6 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	abcmidi
-PORTVERSION=	2011.04.29
+DISTVERSION=	2015-03-27
 CATEGORIES=	audio
-MASTER_SITES=	http://ifdo.ca/~seymour/runabc/
-DISTNAME=	abcMIDI-${PORTVERSION:S/./-/g}
+MASTER_SITES=	http://ifdo.pugmarks.com/~seymour/runabc/
+DISTNAME=	abcMIDI-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert abc music files to MIDI and PostScript
@@ -14,27 +14,30 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-BROKEN=		no public distfiles
-USES=		gmake zip
-MAKEFILE=	makefiles/unix.mak
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DANSILIBS -c" LNK="${CC}"
+USES=		zip
+GNU_CONFIGURE=	yes
 
-MANPAGES=		abc2abc.1 abc2midi.1 mftext.1 midi2abc.1 midicopy.1 yaps.1
+PORTDOCS=	*
+PLIST_FILES=	${EXECUTABLES:S,^,bin/,} \
+		${EXECUTABLES:S,^,man/man1/,:S,$,.1.gz,}
 
 OPTIONS_DEFINE=	DOCS
 
-do-install:
-.for FILE in abc2abc abc2midi abcmatch mftext midi2abc midicopy yaps
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for FILE in ${MANPAGES}
-	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
+EXECUTABLES=	abc2abc abc2midi abcmatch mftext midi2abc midicopy yaps
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's| -O2||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^docdir/s|= .*|= $${datadir}/doc/abcmidi| ; \
+		 s|$${prefix}/||g ; \
+		 s|$$(INSTALL) -m 755|$$(INSTALL_PROGRAM)| ; \
+		 s|$$(INSTALL) -m 644|$$(INSTALL_DATA)|' \
+		${WRKSRC}/Makefile.in
+
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/programming
-	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.abc ${STAGEDIR}${DOCSDIR}/programming
-	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.txt ${STAGEDIR}${DOCSDIR}/programming
+	(cd ${WRKSRC}/doc/programming && ${INSTALL_DATA} *.abc *.txt \
+		${STAGEDIR}${DOCSDIR}/programming)
 
 .include <bsd.port.mk>
diff --git a/audio/abcmidi/distinfo b/audio/abcmidi/distinfo
index a8c6268ca015..85dc76356823 100644
--- a/audio/abcmidi/distinfo
+++ b/audio/abcmidi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcMIDI-2011-04-29.zip) = 1bea84b1793c204c3720995ad10aa3d1bccd1c99f9e560d5d14a465b21e6751a
-SIZE (abcMIDI-2011-04-29.zip) = 404896
+SHA256 (abcMIDI-2015-03-27.zip) = 07f3f8ab368cee03e9f8cba09548afab21a939b185afbae2ee8e3b34457aad02
+SIZE (abcMIDI-2015-03-27.zip) = 517673
diff --git a/audio/abcmidi/pkg-plist b/audio/abcmidi/pkg-plist
deleted file mode 100644
index 08a2354fcb2e..000000000000
--- a/audio/abcmidi/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-bin/abc2abc
-bin/abc2midi
-bin/abcmatch
-bin/mftext
-bin/midi2abc
-bin/midicopy
-bin/yaps
-man/man1/abc2abc.1.gz
-man/man1/abc2midi.1.gz
-man/man1/mftext.1.gz
-man/man1/midi2abc.1.gz
-man/man1/midicopy.1.gz
-man/man1/yaps.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/abcguide.txt
-%%PORTDOCS%%%%DOCSDIR%%/abcmatch.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/programming/abc2midi.txt
-%%PORTDOCS%%%%DOCSDIR%%/programming/coding.txt
-%%PORTDOCS%%%%DOCSDIR%%/programming/midi2abc.txt
-%%PORTDOCS%%%%DOCSDIR%%/programming/split.abc
-%%PORTDOCS%%%%DOCSDIR%%/programming/yaps.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/yapshelp.txt