svn commit: r336220 - in head/print/mup: . files

[Boris Samorodov]

Author: bsam
Date: Wed Dec 11 20:11:33 2013
New Revision: 336220
URL: http://svnweb.freebsd.org/changeset/ports/336220

Log:
  . unbreak at 10.x and up (non void function should return a value);
  . allow staging;
  . remove the indefinite article from COMMENT;
  . remove a .for loop at do-install target;
  . mute MKDIR.

Added:
  head/print/mup/files/patch-mup::grpsyl.c   (contents, props changed)
Modified:
  head/print/mup/Makefile

Modified: head/print/mup/Makefile
==============================================================================
--- head/print/mup/Makefile	Wed Dec 11 20:10:08 2013	(r336219)
+++ head/print/mup/Makefile	Wed Dec 11 20:11:33 2013	(r336220)
@@ -8,16 +8,16 @@ MASTER_SITES=	ftp://ftp.arkkra.com/pub/u
 DISTFILES=	mup${PORTVERSION:S/.//}src.tar.gz
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A shareware program for typesetting music
+COMMENT=	Shareware program for typesetting music
 
-MAN1=		mup.1 mkmupfnt.1 mupdisp.1 mupprnt.1
-PLIST_FILES=	bin/mkmupfnt bin/mup bin/mupdisp bin/mupprnt
+PLIST_FILES=	bin/mkmupfnt bin/mup bin/mupdisp bin/mupprnt \
+		man/man1/mup.1.gz man/man1/mkmupfnt.1.gz \
+		man/man1/mupdisp.1.gz man/man1/mupprnt.1.gz
 USE_XORG=	x11
 MOREDOCS=	docs/README0 docs/overview.txt docs/register.txt\
 		docs/mupfeat.txt docs/faq.txt docs/license.txt docs/uguide.ps
 PORTDOCS=	*
 
-NO_STAGE=	yes
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 	${CP} ${FILESDIR}/Makefile.mup ${WRKSRC}/mup/Makefile
@@ -25,20 +25,15 @@ post-extract:
 	${CP} ${FILESDIR}/Makefile.disp ${WRKSRC}/mupdisp/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mup/mup ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mkmupfnt/mkmupfnt ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mupdisp/mupdisp ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/mupprnt ${PREFIX}/bin
-.for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/mup/mup ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mkmupfnt/mkmupfnt ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mupdisp/mupdisp ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mupprnt ${STAGEDIR}${PREFIX}/bin
+.for f in mup.1 mkmupfnt.1 mupdisp.1 mupprnt.1
+	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/uguide
-	${FIND} ${WRKSRC}/docs/uguide -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/uguide \;
-.for f in ${MOREDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/uguide
+	${FIND} ${WRKSRC}/docs/uguide -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/uguide \;
+	${INSTALL_DATA} ${MOREDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/print/mup/files/patch-mup::grpsyl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/mup/files/patch-mup::grpsyl.c	Wed Dec 11 20:11:33 2013	(r336220)
@@ -0,0 +1,11 @@
+--- mup/grpsyl.c.orig	2013-12-11 23:55:33.069603514 +0400
++++ mup/grpsyl.c	2013-12-11 23:56:52.275555216 +0400
+@@ -2107,7 +2107,7 @@
+ 		if (list_p->str != S_STAFF) {
+ 			/* Do error check like in check4missing_voices() */
+ 			if (Errorcount > 0) {
+-				return;
++				return(0);
+ 			}
+ 			else {
+ 				pfatal("proc_emptymeas: info about staff %d not in list", s);