Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Dec 2011 00:31:26 GMT
From:      Vincent Hoffman-Kazlauskas <vince@unsane.co.uk>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/163193: [PATCH] Fix port skippy-xd for amd64 arch
Message-ID:  <201112120031.pBC0VQtd066948@red.freebsd.org>
Resent-Message-ID: <201112120040.pBC0e25x016144@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163193
>Category:       ports
>Synopsis:       [PATCH] Fix port skippy-xd for amd64 arch
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 12 00:40:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Vincent Hoffman-Kazlauskas
>Release:        9.0-PRERELEASE (9-STABLE)
>Organization:
>Environment:
FreeBSD ostracod.unsane.co.uk 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #16 r228059: Mon Nov 28 19:40:38 GMT 2011     root@ostracod.unsane.co.uk:/usr/obj/usr/src/sys/OSTRACOD  amd64
>Description:
This port wasnt working for me on an amd64 system. I have not tried on i386.
A quick google around found 
http://freecode.com/projects/skippy/comments
The sed in the second comment fixed it for me.

>How-To-Repeat:
install and try to run skippy-xd on an amd64 system.
>Fix:


Patch attached with submission follows:

--- Makefile.orig	2011-12-12 00:16:33.000000000 +0000
+++ Makefile	2011-12-12 00:13:31.000000000 +0000
@@ -24,10 +24,19 @@
 PLIST_DIRS=	%%DATADIR%%
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
 		s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \
 			${WRKSRC}/Makefile
+.if ${ARCH} == "amd64"
+	@${REINPLACE_CMD} -e 's|CARD32|CARD64|g' ${WRKSRC}/clientwin.c
+	@${REINPLACE_CMD} -e 's|CARD32|CARD64|g' ${WRKSRC}/skippy.c
+	@${REINPLACE_CMD} -e 's|CARD32|CARD64|g' ${WRKSRC}/wm.c
+	@${REINPLACE_CMD} -e 's|CARD32|CARD64|g' ${WRKSRC}/wm.h
+.endif
+
 post-build:
 	@${SED} 's|%%DATADIR%%|${DATADIR}|' ${PKGDIR}/pkg-message >${PKGMESSAGE}
 
@@ -39,4 +48,4 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



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