Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2013 17:34:54 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337568 - head/audio/abcmidi
Message-ID:  <201312261734.rBQHYsBH094489@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Dec 26 17:34:54 2013
New Revision: 337568
URL: http://svnweb.freebsd.org/changeset/ports/337568

Log:
  Support stage
  Use bsdtar to extract zip

Modified:
  head/audio/abcmidi/Makefile
  head/audio/abcmidi/pkg-plist

Modified: head/audio/abcmidi/Makefile
==============================================================================
--- head/audio/abcmidi/Makefile	Thu Dec 26 17:34:43 2013	(r337567)
+++ head/audio/abcmidi/Makefile	Thu Dec 26 17:34:54 2013	(r337568)
@@ -6,6 +6,7 @@ PORTVERSION=	2011.04.29
 CATEGORIES=	audio
 MASTER_SITES=	http://ifdo.ca/~seymour/runabc/
 DISTNAME=	abcMIDI-${PORTVERSION:S/./-/g}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Convert abc music files to MIDI and PostScript
@@ -14,30 +15,24 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-EXTRACT_BEFORE_ARGS=	-aqo
-
-NO_STAGE=	yes
-USE_ZIP=	yes
 USES=		gmake
 MAKEFILE=	makefiles/unix.mak
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DANSILIBS -c" LNK="${CC}"
 
-MAN1=		abc2abc.1 abc2midi.1 mftext.1 midi2abc.1 midicopy.1 yaps.1
+MANPAGES=		abc2abc.1 abc2midi.1 mftext.1 midi2abc.1 midicopy.1 yaps.1
 
 do-install:
 .for FILE in abc2abc abc2midi abcmatch mftext midi2abc midicopy yaps
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.for FILE in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${MAN1PREFIX}/man/man1
+.for FILE in ${MANPAGES}
+	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/programming
-	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.abc ${DOCSDIR}/programming
-	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.txt ${DOCSDIR}/programming
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/programming
+	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.abc ${STAGEDIR}${DOCSDIR}/programming
+	${INSTALL_DATA} ${WRKSRC}/doc/programming/*.txt ${STAGEDIR}${DOCSDIR}/programming
 
 .include <bsd.port.mk>

Modified: head/audio/abcmidi/pkg-plist
==============================================================================
--- head/audio/abcmidi/pkg-plist	Thu Dec 26 17:34:43 2013	(r337567)
+++ head/audio/abcmidi/pkg-plist	Thu Dec 26 17:34:54 2013	(r337568)
@@ -5,6 +5,12 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312261734.rBQHYsBH094489>