Date: Wed, 21 Dec 2011 18:39:32 GMT From: "A.J. Kehoe IV (Nanoman)" <ibxht163@nanoman.ca> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163510: FreeBSD Port emulators/fceux Patch Message-ID: <201112211839.pBLIdWWW096537@red.freebsd.org> Resent-Message-ID: <201112211840.pBLIe73h083341@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163510
>Category: ports
>Synopsis: FreeBSD Port emulators/fceux Patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 21 18:40:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: A.J. Kehoe IV (Nanoman)
>Release: 8.2
>Organization:
Nanoman's Company
>Environment:
FreeBSD localhost 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The maintainer (davide.italiano@gmail.com) asked me to send a PR because he doesn't have time for this at the moment.
I discovered that the FreeBSD port emulators/fceux doesn't reinstall as intended.
-----BEGIN QUOTE-----
# make deinstall
===> Deinstalling for emulators/fceux
===> Deinstalling fceux-2.1.4a
# make reinstall
===> Installing for fceux-2.1.4a
===> fceux-2.1.4a depends on shared library: SDL-1.2.11 - found
===> fceux-2.1.4a depends on shared library: lua-5.1.1 - found
===> Generating temporary packing list
===> Checking if emulators/fceux already installed
install -s -o root -g wheel -m 555 /usr/ports/emulators/fceux/work/fceu2.1.4a/src/fceux /usr/local/bin
install -o root -g wheel -m 444 /usr/ports/emulators/fceux/work/fceu2.1.4a/documentation/fceux.6 /usr/local/man/man6
install: /usr/ports/emulators/fceux/work/fceu2.1.4a/documentation/fceux.6: No such file or directory
*** Error code 71
Stop in /usr/ports/emulators/fceux.
*** Error code 1
Stop in /usr/ports/emulators/fceux.
-----END QUOTE-----
>How-To-Repeat:
cd /usr/ports/emulators/fceux
make install
make deinstall
make reinstall
>Fix:
In the "do-install" part of the Makefile, fceux.6 is deleted from the work directory's "documentation" folder. Simply removing this "rm" line would break the package list, so I decided to move fceux.6 out of the work directory's "documentation" folder during the "post-extract" phase.
I also noticed that the "post-extract" part of the Makefile doesn't work as intended. The first line starts with spaces instead of a tab, which isn't accepted.
I've attached a patch for the Makefile.
Patch attached with submission follows:
--- ports/emulators/fceux/Makefile.old 2010-09-13 04:42:33.000000000 -0400
+++ ports/emulators/fceux/Makefile 2011-12-21 01:58:32.856832000 -0500
@@ -29,13 +29,13 @@
.include <bsd.port.pre.mk>
post-extract:
- ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
+ ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
${WRKSRC}/src/drivers/common/vidblit.cpp
+ @${MV} ${WRKSRC}/documentation/fceux.6 ${WRKSRC}/
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/fceux ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/documentation/fceux.6 ${PREFIX}/man/man6
- ${RM} ${WRKSRC}/documentation/fceux.6
+ ${INSTALL_MAN} ${WRKSRC}/fceux.6 ${PREFIX}/man/man6
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${DOCSDIR}/
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112211839.pBLIdWWW096537>