Date: Tue, 8 Jun 2010 21:50:31 GMT From: Warren Block <wblock@wonkity.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/147702: [patch] Add icon to www/links and make desktop file conditional on X11 Message-ID: <201006082150.o58LoVLP047929@www.freebsd.org> Resent-Message-ID: <201006082200.o58M0CNe050551@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.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 <bsd.port.post.mk>
+.if !defined(WITHOUT_X11)
+post-install:
+ @${INSTALL} ${WRKSRC}/graphics/links.xpm ${PREFIX}/share/pixmaps/links.xpm
+.endif
+
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006082150.o58LoVLP047929>