Date: Tue, 23 Nov 2004 11:04:49 +0100 (CET) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bkhl@elektrubadur.se Subject: ports/74283: [PATCH] x11-wm/ratpoison: Add GDM support and calm portlint Message-ID: <200411231004.iANA4nV0018048@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200411231010.iANAAQVo065066@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74283
>Category: ports
>Synopsis: [PATCH] x11-wm/ratpoison: Add GDM support and calm portlint
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 23 10:10:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Mon Nov 15 17:58:51 CET 2004
>Description:
- Add support for GDM sessions (only when WITH_GDM is defined)
- Calm portlint by tweaking a little Makefile and pkg-plist
NOTE: There's a problem with installed files when NOPORTDOCS is defined.
Actually the shared files are not installed but are still listed in the packing
list. I tried to have them installed but with no success so far so I guess we
will have to prefix them with %%PORTDOCS%% in pkg-plist so that the 'deinstall'
target does not complain.
Added file(s):
- files/ratpoison.desktop
Port maintainer (bkhl@elektrubadur.se) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- ratpoison-1.3.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/x11-wm/ratpoison/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile 17 Jun 2004 14:28:27 -0000 1.9
+++ Makefile 23 Nov 2004 09:55:40 -0000
@@ -14,12 +14,27 @@
MAINTAINER= bkhl@elektrubadur.se
COMMENT= Simple window manager with no fat library dependencies
-MAN1= ratpoison.1
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
+.if defined (WITH_GDM)
+PLIST_SUB+= WITH_GDM=""
+post-configure:
+ ${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/ratpoison.desktop \
+ > ${WRKSRC}/ratpoison.desktop
+
+post-install:
+ ${MKDIR} ${PREFIX}/etc/gdm/Sessions
+ ${INSTALL_DATA} ${WRKSRC}/ratpoison.desktop ${PREFIX}/etc/dm/Sessions/
+.else
+PLIST_SUB+= WITH_GDM="@comment "
+.endif
+
.if defined(NOPORTDOCS)
INSTALL_TARGET= SUBDIRS=src install-exec
+.else
+MAN1= ratpoison.1
+INFO= ratpoison
.endif
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /var/fcvs/ports/x11-wm/ratpoison/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist 17 Jun 2004 10:56:42 -0000 1.5
+++ pkg-plist 23 Nov 2004 09:55:54 -0000
@@ -1,19 +1,17 @@
@comment $FreeBSD: ports/x11-wm/ratpoison/pkg-plist,v 1.5 2004/06/17 10:56:42 jkoshy Exp $
bin/ratpoison
-share/ratpoison/allwindows.sh
-share/ratpoison/clickframe.pl
-share/ratpoison/genrpbindings
-share/ratpoison/ratpoison.el
-share/ratpoison/rpshowall.sh
-share/ratpoison/rpws
-share/ratpoison/split.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/ratpoison %D/info/dir
-%%PORTDOCS%%info/ratpoison.info
-%%PORTDOCS%%@exec install-info %D/info/ratpoison.info %D/info/dir
-%%PORTDOCS%%share/doc/ratpoison/AUTHORS
-%%PORTDOCS%%share/doc/ratpoison/COPYING
-%%PORTDOCS%%share/doc/ratpoison/ChangeLog
-%%PORTDOCS%%share/doc/ratpoison/NEWS
-%%PORTDOCS%%share/doc/ratpoison/README
-%%PORTDOCS%%@dirrm share/doc/ratpoison
-@dirrm share/ratpoison
+%%DATADIR%%/allwindows.sh
+%%DATADIR%%/clickframe.pl
+%%DATADIR%%/genrpbindings
+%%DATADIR%%/ratpoison.el
+%%DATADIR%%/rpshowall.sh
+%%DATADIR%%/rpws
+%%DATADIR%%/split.sh
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%WITH_GDM%%etc/dm/Sessions/ratpoison.desktop
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
Index: files/ratpoison.desktop
===================================================================
RCS file: files/ratpoison.desktop
diff -N files/ratpoison.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/ratpoison.desktop 23 Nov 2004 09:22:26 -0000
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=Ratpoison
+Exec=%%PREFIX%%/bin/ratpoison
--- ratpoison-1.3.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411231004.iANA4nV0018048>