Date: Sat, 14 Jul 2012 17:49:34 GMT From: HU Dong <itechbear@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169860: [patch]www/xxxterm has been renamed. I want to take over the maintainership. Message-ID: <201207141749.q6EHnYFW009785@red.freebsd.org> Resent-Message-ID: <201207141750.q6EHo95E036678@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169860
>Category: ports
>Synopsis: [patch]www/xxxterm has been renamed. I want to take over the maintainership.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 14 17:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: HU Dong
>Release: FreeBSD 9.0 Release-p3 i386
>Organization:
None
>Environment:
FreeBSD 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 01:47:53 UTC 2012 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Since the port www/xxxterm has been renamed to xombrero and got a new version policy, I notified the port maintainer Aldis Berjoza via email. He replied that he doesn't have much time to maintain this port and asked if I would like to continue this task. After some efforts, with his help, I made new port files work. The patch for port www/xombrero is attached, and I volunteer to be the next port maintainer.
>How-To-Repeat:
None.
>Fix:
As the attachment.
Patch attached with submission follows:
diff -ruN xxxterm/Makefile xombrero/Makefile
--- xxxterm/Makefile 2012-06-01 13:25:05.000000000 +0800
+++ xombrero/Makefile 2012-07-15 01:33:59.000000000 +0800
@@ -1,20 +1,19 @@
-# New ports collection makefile for: xxxterm
+# New ports collection makefile for: xombrero
# Date created: 2011.01.15
# Whom: Aldis Berjoza <aldis@bsdroot.lv>
#
-# $FreeBSD: ports/www/xxxterm/Makefile,v 1.13 2012/06/01 05:25:05 dinoex Exp $
+# $FreeBSD: ports/www/xombrero/Makefile,v 1.2.0 2012/07/12 14:58:00 dinoex Exp $
#
-PORTNAME= xxxterm
-PORTVERSION= 1.10.0
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTNAME= xombrero
+PORTVERSION= 1.2.0
+PORTEPOCH= 2
CATEGORIES= www
-MASTER_SITES= https://opensource.conformal.com/snapshots/xxxterm/ \
+MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ \
SF/xxxterm/
EXTRACT_SUFX= .tgz
-MAINTAINER= graudeejs@gmail.com
+MAINTAINER= itechbear@gmail.com
COMMENT= Minimalists vi-like web browser based on webkit and GTK+
LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \
@@ -24,10 +23,8 @@
USE_GNOME= gtk20 pkgconfig
USE_PERL5_BUILD=YES
-PLIST_FILES= bin/xxxterm
-MAN1= xxxterm.1
-PORTEXAMPLES= favorites xxxterm.conf
-PLIST_DIRS+= share/xxxterm
+MAN1= xombrero.1
+PORTEXAMPLES= favorites xombrero.conf
.include <bsd.port.pre.mk>
@@ -36,26 +33,31 @@
.endif
ICONS= 16 32 48 64 128
-.for i in ${ICONS}
-PLIST_FILES+= share/xxxterm/xxxtermicon${i}.png
-.endfor
-PLIST_FILES+= share/xxxterm/style.css
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|CFLAGS\+=|CFLAGS\+= -I \.\.\/|g' ${WRKSRC}/freebsd/Makefile
+ @${REINPLACE_CMD} -e 's|LOGIN_NAME_MAX|sysconf(_SC_LOGIN_NAME_MAX)|g' ${WRKSRC}/xombrero.c
+ @${REINPLACE_CMD} -e 's|#define XT_DS_CA_SSL_FILE ("")|#define XT_DS_CA_SSL_FILE ("\/usr\/local\/share\/certs\/ca-root-nss.crt")|g' ${WRKSRC}/xombrero.h
do-build:
- (cd ${WRKSRC}/freebsd && make)
+ cd ${WRKSRC}/freebsd && make GTK_VERSION="gtk2"
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/freebsd/xxxterm ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/xxxterm.1 ${PREFIX}/man/man1/
+ ${INSTALL_SCRIPT} ${WRKSRC}/freebsd/xombrero ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${PREFIX}/man/man1/
${MKDIR} ${PREFIX}/share/${PORTNAME}
.for i in ${ICONS}
- ${INSTALL_DATA} ${WRKSRC}/xxxtermicon${i}.png ${PREFIX}/share/xxxterm/
+ ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${PREFIX}/share/${PORTNAME}/
.endfor
- ${INSTALL_DATA} ${WRKSRC}/style.css ${PREFIX}/share/xxxterm/
+ ${INSTALL_DATA} ${WRKSRC}/style.css ${PREFIX}/share/${PORTNAME}/
+ ${INSTALL_DATA} ${WRKSRC}/tld-rules ${PREFIX}/share/${PORTNAME}/
+ ${INSTALL_DATA} ${WRKSRC}/playflash.sh ${PREFIX}/share/${PORTNAME}/
+ ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${PREFIX}/share/applications/
+
.if !defined(NOPORTEXAMPLES)
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/favorites ${EXAMPLESDIR}/
- ${INSTALL_DATA} ${WRKSRC}/xxxterm.conf ${EXAMPLESDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/xombrero.conf ${EXAMPLESDIR}/
.endif
.include <bsd.port.post.mk>
diff -ruN xxxterm/distinfo xombrero/distinfo
--- xxxterm/distinfo 2012-01-22 19:57:16.000000000 +0800
+++ xombrero/distinfo 2012-07-15 01:33:28.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (xxxterm-1.10.0.tgz) = 70987029223012be5c1c1f2c1d021af604550b8a10dc66abd993b1f315614d25
-SIZE (xxxterm-1.10.0.tgz) = 187630
+SHA256 (xombrero-1.2.0.tgz) = 4ca182aaf4bdc69df85ed14c780b83b7c8aa698e5eb1c63c2a329ba3e78c3499
+SIZE (xombrero-1.2.0.tgz) = 241465
diff -ruN xxxterm/pkg-descr xombrero/pkg-descr
--- xxxterm/pkg-descr 2011-09-06 18:17:20.000000000 +0800
+++ xombrero/pkg-descr 2012-07-15 01:25:27.000000000 +0800
@@ -1,5 +1,5 @@
-xxxterm is a minimalists web browser. It strives to be vi-like for heavy
-keyboard users while maintaining traditional web browser behaviour. It is ISC
-licensed. It is based on webkit using GTK+.
+xombrero, previously known as xxxterm, is a minimalists web browser. It strives
+to be vi-like for heavy keyboard users while maintaining traditional web browser
+ behaviour. It is ISC licensed. It is based on webkit using GTK+.
WWW: https://opensource.conformal.com/wiki/XXXTerm
diff -ruN xxxterm/pkg-plist xombrero/pkg-plist
--- xxxterm/pkg-plist 1970-01-01 08:00:00.000000000 +0800
+++ xombrero/pkg-plist 2012-07-15 01:27:31.000000000 +0800
@@ -0,0 +1,13 @@
+bin/xombrero
+share/xombrero/xombreroicon16.png
+share/xombrero/xombreroicon32.png
+share/xombrero/xombreroicon48.png
+share/xombrero/xombreroicon64.png
+share/xombrero/xombreroicon128.png
+share/xombrero/style.css
+share/xombrero/tld-rules
+share/xombrero/playflash.sh
+share/applications/xombrero.desktop
+
+@dirrm share/xombrero
+@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207141749.q6EHnYFW009785>