On Fri, Apr 10, 2009 at 10:47:32AM +0200, Simon Bertrang wrote:
> On Thu, Apr 09, 2009 at 03:18:39PM +0200, Sylvestre Gallon wrote:
> > On Sun, Mar 15, 2009 at 7:39 PM, Hannah Schroeter <[email protected]> wrote:
> > > Hi!
> > >
> > > There's a typo in the port (not patched in but in the context):
> > >
> > > On Fri, Mar 13, 2009 at 11:04:25AM +0100, Simon Bertrang wrote:
> > >>[...]
> > >>--- Makefile 10 Nov 2008 22:10:22 -0000 1.1.1.1
> > >>+++ Makefile 13 Mar 2009 10:03:46 -0000
> > >>@@ -1,11 +1,9 @@
> > >> # $OpenBSD: Makefile,v 1.1.1.1 2008/11/10 22:10:22 ajacoutot Exp $
> > >>
> > >>-# needs joystick.h
> > >>-ONLY_FOR_ARCHS = i386
> > >>-
> > >> COMMENT = suite of portable game librairies
> > > ^ drop that i.
> > >>
> > >>[...]
> > >
> > > Kind regards,
> > >
> > > Hannah.
> > >
> >
> > up ?
> >
>
> Thanks, fixed.
>
Oops, credits wrt/ the typo should have gone to Hannah instead, sorry.
Here's a new diff to get rid of ONLY_FOR_ARCHS by leveraging
{CONFIGURE,PKG}_ARGS, please test and comment.
Kind regards,
Simon
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/plib/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 10 Apr 2009 08:54:32 -0000 1.3
+++ Makefile 10 Apr 2009 09:05:27 -0000
@@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2009/04/10 08:54:32 simon Exp $
-# needs joystick.h
-ONLY_FOR_ARCHS = i386
-
COMMENT = suite of portable game libraries
DISTNAME = plib-1.8.5
-PKGNAME = ${DISTNAME}p0
+PKGNAME = ${DISTNAME}p1
CATEGORIES = devel games
HOMEPAGE = http://plib.sourceforge.net/
@@ -24,5 +21,13 @@ USE_X11 = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-GL=${X11BASE}
+
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS += --enable-js
+PKG_ARGS += -Di386=1
+.else
+CONFIGURE_ARGS += --disable-js
+PKG_ARGS += -Di386=0
+.endif
.include <bsd.port.mk>
Index: pkg/PFRAG.i386
===================================================================
RCS file: pkg/PFRAG.i386
diff -N pkg/PFRAG.i386
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.i386 10 Apr 2009 09:05:27 -0000
@@ -0,0 +1,3 @@
+...@comment $OpenBSD$
+include/plib/js.h
+lib/libplibjs.a
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/plib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Nov 2008 22:10:22 -0000 1.1.1.1
+++ pkg/PLIST 10 Apr 2009 09:05:27 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/11/10 22:10:22 ajacoutot Exp $
include/plib/
include/plib/fnt.h
-include/plib/js.h
include/plib/net.h
include/plib/netBuffer.h
include/plib/netChannel.h
@@ -41,7 +40,6 @@ include/plib/ssgconf.h
include/plib/ul.h
include/plib/ulRTTI.h
lib/libplibfnt.a
-lib/libplibjs.a
lib/libplibnet.a
lib/libplibpsl.a
lib/libplibpu.a
