diff -ruN xxxterm/Makefile xombrero/Makefile
--- xxxterm/Makefile	2012-07-14 22:29:18.662529000 +0800
+++ xombrero/Makefile	2012-07-27 23:42:39.000000000 +0800
@@ -1,33 +1,29 @@
-# New ports collection makefile for:	xxxterm
-# Date created:				2011.01.15
-# Whom:					Aldis Berjoza <aldis@bsdroot.lv>
+# New ports collection makefile for:	xombrero
+# Date created:				July 27 2012
+# Whom:					HU Dong <itechbear@gmail.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xxxterm
-PORTVERSION=	1.10.0
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTNAME=	xombrero
+PORTVERSION=	1.2.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 \
-		soup-2.4:${PORTSDIR}/devel/libsoup \
-		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
+		soup-2:${PORTSDIR}/devel/libsoup \
+		webkitgtk-1:${PORTSDIR}/www/webkit-gtk2
 
 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 +32,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_SSL_CA_FILE	("")|#define XT_DS_SSL_CA_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-07-14 22:29:18.662529000 +0800
+++ xombrero/distinfo	2012-07-27 13:39:53.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (xxxterm-1.10.0.tgz) = 70987029223012be5c1c1f2c1d021af604550b8a10dc66abd993b1f315614d25
-SIZE (xxxterm-1.10.0.tgz) = 187630
+SHA256 (xombrero-1.2.2.tgz) = 7cd2d1174239b5e3f897473ca69efc1fb303491d6ed60bf068263adfb76b164a
+SIZE (xombrero-1.2.2.tgz) = 242038
diff -ruN xxxterm/pkg-descr xombrero/pkg-descr
--- xxxterm/pkg-descr	2012-07-14 22:29:18.662529000 +0800
+++ xombrero/pkg-descr	2012-07-27 15:36:19.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
+WWW: https://opensource.conformal.com/wiki/xombrero
diff -ruN xxxterm/pkg-plist xombrero/pkg-plist
--- xxxterm/pkg-plist	1970-01-01 08:00:00.000000000 +0800
+++ xombrero/pkg-plist	2012-07-27 15:51:09.000000000 +0800
@@ -0,0 +1,13 @@
+bin/xombrero
+%%DATADIR%%/xombreroicon16.png
+%%DATADIR%%/xombreroicon32.png
+%%DATADIR%%/xombreroicon48.png
+%%DATADIR%%/xombreroicon64.png
+%%DATADIR%%/xombreroicon128.png
+%%DATADIR%%/style.css
+%%DATADIR%%/tld-rules
+%%DATADIR%%/playflash.sh
+share/applications/xombrero.desktop
+
+@dirrm share/xombrero
+@dirrmtry share/applications