aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
authorbsam <bsam@FreeBSD.org>2013-12-12 04:11:33 +0800
committerbsam <bsam@FreeBSD.org>2013-12-12 04:11:33 +0800
commit202c0b58817de4b91ca7246e3a3d91f017f90e4a (patch)
tree9e749e1fb14cf358dd07bf657224882efc5b20c8 /print
parentdf462e41d6d1a42a20585dea250343829b96ba39 (diff)
downloadfreebsd-ports-graphics-202c0b58817de4b91ca7246e3a3d91f017f90e4a.tar.gz
freebsd-ports-graphics-202c0b58817de4b91ca7246e3a3d91f017f90e4a.tar.zst
freebsd-ports-graphics-202c0b58817de4b91ca7246e3a3d91f017f90e4a.zip
. 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.
Diffstat (limited to 'print')
-rw-r--r--print/mup/Makefile31
-rw-r--r--print/mup/files/patch-mup::grpsyl.c11
2 files changed, 24 insertions, 18 deletions
diff --git a/print/mup/Makefile b/print/mup/Makefile
index a8f4bad42e4..c558c7b9202 100644
--- a/print/mup/Makefile
+++ b/print/mup/Makefile
@@ -8,16 +8,16 @@ MASTER_SITES= ftp://ftp.arkkra.com/pub/unix/
DISTFILES= mup${PORTVERSION:S/.//}src.tar.gz
MAINTAINER= ports@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>
diff --git a/print/mup/files/patch-mup::grpsyl.c b/print/mup/files/patch-mup::grpsyl.c
new file mode 100644
index 00000000000..b43c7e4070b
--- /dev/null
+++ b/print/mup/files/patch-mup::grpsyl.c
@@ -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);