Date: Mon, 13 Nov 2006 18:25:09 -0300 From: "Alejandro Pulver" <alepulver@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/105492: [UPDATE] databases/flamerobin: integrate completely with bsd.wx.mk Message-ID: <1163453109.73018@phobos.mars.bsd> Resent-Message-ID: <200611132130.kADLU9Iw052698@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105492
>Category: ports
>Synopsis: [UPDATE] databases/flamerobin: integrate completely with bsd.wx.mk
>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: Mon Nov 13 21:30:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 6.1-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD 6.1-RELEASE-p1 #3: Mon Jun 19 14:49:35 ART 2006
root@phobos.mars.bsd:/usr/obj/usr/src/sys/ATHLON-PHOBOS
>Description:
- Integrate completely with bsd.wx.mk.
- Use ARCH instead of MACHINE_ARCH (will possibly allow cross-compilation).
- Rename local WX_VERSION since it is a variable defined in bsd.wx.mk.
- Remove BROKEN for 4.x since bsd.wx.mk takes care of it when WX_UNICODE is defined.
>How-To-Repeat:
>Fix:
--- flamerobin.diff begins here ---
Index: flamerobin/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/flamerobin/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- flamerobin/Makefile 17 Sep 2006 09:48:49 -0000 1.4
+++ flamerobin/Makefile 13 Nov 2006 21:19:16 -0000
@@ -19,28 +19,22 @@
USE_WX= 2.6
WX_COMPS= wx contrib
+WX_CONF_ARGS= absolute
+WX_PREMK= yes
WX_UNICODE= yes
-GNU_CONFIGURE= yes
USE_X_PREFIX= yes
-
-WX_CONFIG= ${X11BASE}/bin/wxgtk2u-2.6-config
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
SUB_FILES= pkg-message
MAN1= flamerobin.1
-.if exists(${WX_CONFIG})
-WX_VERSION!= ${WX_CONFIG} --release
-PLIST_SUB+= WX_VERSION=${WX_VERSION}
-.endif
-
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG}
-
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not compile on FreeBSD 4.x
+.if exists(${WX_CONFIG})
+WX_VER_STR!= ${WX_CONFIG} --release
+PLIST_SUB+= WX_VERSION=${WX_VER_STR}
.endif
post-install:
--- flamerobin.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1163453109.73018>