From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 13 22:00:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 004F316A420 for ; Mon, 13 Feb 2006 22:00:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CCD743D48 for ; Mon, 13 Feb 2006 22:00:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1DM0FbX019788 for ; Mon, 13 Feb 2006 22:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1DM0FCp019786; Mon, 13 Feb 2006 22:00:15 GMT (envelope-from gnats) Resent-Date: Mon, 13 Feb 2006 22:00:15 GMT Resent-Message-Id: <200602132200.k1DM0FCp019786@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Arjan van Leeuwen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 356D516A420 for ; Mon, 13 Feb 2006 21:53:36 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: from gimp.piwebs.com (82-197-201-59.dsl.cambrium.nl [82.197.201.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9A3E43D6B for ; Mon, 13 Feb 2006 21:53:30 +0000 (GMT) (envelope-from avleeuwen@piwebs.com) Received: (qmail 97969 invoked from network); 13 Feb 2006 21:53:36 -0000 Received: from unknown (HELO winston.piwebs.com) (192.168.0.63) by gimp.piwebs.com with SMTP; 13 Feb 2006 21:53:36 -0000 Message-Id: <1139867608.5938@winston.piwebs.com> Date: Mon, 13 Feb 2006 22:53:28 +0100 From: "Arjan van Leeuwen" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: lawrance@FreeBSD.org Subject: ports/93312: [PATCH] www/opera-devel: enable installation of 4.x static binaries on FreeBSD >= 5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 22:00:16 -0000 >Number: 93312 >Category: ports >Synopsis: [PATCH] www/opera-devel: enable installation of 4.x static binaries on FreeBSD >= 5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 13 22:00:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.0-RELEASE #13: Sun Nov 6 14:50:54 CET 2005 root@winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON >Description: This patch gives the user the option to install a version of Opera that either uses a shared Qt library or a statically linked one. Because there are no static builds available for FreeBSD >= 5, choosing a static build on these systems installs the FreeBSD 4.x binary and depends on compatxx ports. Requested by: Kirill Ponomarew >How-To-Repeat: >Fix: --- opera-devel.diff begins here --- diff -urN /usr/ports/www/opera-devel/Makefile opera-devel/Makefile --- /usr/ports/www/opera-devel/Makefile Sat Feb 11 07:22:48 2006 +++ opera-devel/Makefile Mon Feb 13 22:45:27 2006 @@ -31,22 +31,27 @@ NO_BUILD= yes NO_FILTER_SHLIBS=yes -.ifndef(WITHOUT_ASPELL) +OPTIONS= SHARED "Use a shared Qt library (instead of static)" ${QT_PRESENT} \ + ASPELL "Use the aspell library for spell checking" on + +.ifdef(WITH_ASPELL) LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell .endif +.if exists(${X11BASE}/lib/libqt-mt.prl) +QT_PRESENT= on +.else +QT_PRESENT= off +.endif + .include .if ${OSVERSION} >= 600000 OPERA_TYPE= 4 -WITH_SHARED= yes .elif ${OSVERSION} >= 500000 OPERA_TYPE= 3 -WITH_SHARED= yes -.elifdef WITH_SHARED -OPERA_TYPE= 2 .else -OPERA_TYPE= 1 +OPERA_TYPE= 2 .endif .if defined(WITH_SHARED) @@ -54,6 +59,14 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 .else OPERA_LIB= static +OPERA_TYPE= 1 +.endif + +.if ${OPERA_TYPE} == 1 && ${OSVERSION} >= 500000 +LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x +.if ${OSVERSION} >= 600000 +LIB_DEPENDS+= z.2:${PORTSDIR}/misc/compat5x +.endif .endif .if ${HAVE_GNOME:Mgnomehier}!="" @@ -66,18 +79,6 @@ PLIST_SUB+= KDE="" .else PLIST_SUB+= KDE="@comment " -.endif - -pre-everything:: -.if !defined(WITHOUT_ASPELL) || !defined(WITH_SHARED) - @${ECHO_CMD} '===> The following options are available for this port:' - @${ECHO_CMD} '===>' -.if !defined(WITHOUT_ASPELL) - @${ECHO_CMD} '===> Define WITHOUT_ASPELL to not install aspell.' -.endif -.if !defined(WITH_SHARED) - @${ECHO_CMD} '===> Define WITH_SHARED to use a shared Qt library.' -.endif .endif post-patch: --- opera-devel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: