From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 8 22:00:13 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05B1F1065677 for ; Tue, 8 Jun 2010 22:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BD2748FC16 for ; Tue, 8 Jun 2010 22:00:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o58M0CeE050552 for ; Tue, 8 Jun 2010 22:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o58M0CNe050551; Tue, 8 Jun 2010 22:00:12 GMT (envelope-from gnats) Resent-Date: Tue, 8 Jun 2010 22:00:12 GMT Resent-Message-Id: <201006082200.o58M0CNe050551@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, Warren Block Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65A2B106566B for ; Tue, 8 Jun 2010 21:50:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 3AA598FC16 for ; Tue, 8 Jun 2010 21:50:31 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o58LoVKR047930 for ; Tue, 8 Jun 2010 21:50:31 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o58LoVLP047929; Tue, 8 Jun 2010 21:50:31 GMT (envelope-from nobody) Message-Id: <201006082150.o58LoVLP047929@www.freebsd.org> Date: Tue, 8 Jun 2010 21:50:31 GMT From: Warren Block To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/147702: [patch] Add icon to www/links and make desktop file conditional on X11 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: Tue, 08 Jun 2010 22:00:13 -0000 >Number: 147702 >Category: ports >Synopsis: [patch] Add icon to www/links and make desktop file conditional on X11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jun 08 22:00:12 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Warren Block >Release: 8.1-prerelease >Organization: >Environment: FreeBSD lightning 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Mon Jun 7 21:00:33 MDT 2010 root@lightning:/usr/obj/usr/src/sys/LIGHTNING i386 >Description: Added installation of links.xpm to $PREFIX/share/pixmaps. Made creation of .desktop file (DESKTOP_ENTRIES) conditional on X11. Modify DESKTOP_ENTRIES to just use "links" as an icon; let it find the file automatically. Modify DESKTOP_ENTRIES to use "false" instead of ${FALSE} for the startup notification value. I think this is just a preset value, no need for a program call. Switched to new-style bsd.port.options.mk and bsd.port.mk. Bump PORTREVISION to 5. >How-To-Repeat: >Fix: Apply attached patch to www/links Makefile. Patch attached with submission follows: --- Makefile.orig 2010-06-08 14:59:35.000000000 -0600 +++ Makefile 2010-06-08 15:39:47.000000000 -0600 @@ -7,7 +7,7 @@ PORTNAME= links DISTVERSION= 2.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES?= www MASTER_SITES= http://links.twibright.com/download/ @@ -31,20 +31,13 @@ USE_OPENSSL= yes USE_BZIP2= yes -DESKTOP_ENTRIES="links" \ - "Lynx-like text WWW browser" \ - "${DATADIR}/links.xpm" \ - "links -g" \ - "Application;Network;WebBrowser;" \ - ${FALSE} - OPTIONS= SVGALIB "non-X11 graphics support" off \ DIRECTFB "directfb driver support" off \ X11 "X11 graphics support" on \ UTF8 "With gentoo utf-8 patch" on \ TRANS "Hack for background transparency" off -.include +.include .ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB) LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ @@ -72,6 +65,13 @@ .if !defined(WITHOUT_X11) USE_XORG= x11 xproto CONFIGURE_ARGS+= --with-x +DESKTOP_ENTRIES="links" \ + "Lynx-like text WWW browser" \ + "links" \ + "links -g" \ + "Application;Network;WebBrowser;" \ + false +PLIST_FILES+= share/pixmaps/links.xpm .else CONFIGURE_ARGS+= --without-x .endif @@ -87,9 +87,14 @@ .endif MAN1= links.1 -PLIST_FILES= bin/links +PLIST_FILES+= bin/links post-patch: @${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h -.include +.if !defined(WITHOUT_X11) +post-install: + @${INSTALL} ${WRKSRC}/graphics/links.xpm ${PREFIX}/share/pixmaps/links.xpm +.endif + +.include >Release-Note: >Audit-Trail: >Unformatted: