diff -ruN xxxterm/Makefile xombrero/Makefile --- xxxterm/Makefile 2012-08-17 21:34:04.000000000 +0800 +++ xombrero/Makefile 2012-08-17 21:43:58.000000000 +0800 @@ -1,33 +1,43 @@ -# New ports collection makefile for: xxxterm -# Date created: 2011.01.15 -# Whom: Aldis Berjoza +# New ports collection makefile for: xombrero +# Date created: July 27 2012 +# Whom: HU Dong # # $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 - -USE_GNOME= gtk20 pkgconfig -USE_PERL5_BUILD=YES - -PLIST_FILES= bin/xxxterm -MAN1= xxxterm.1 -PORTEXAMPLES= favorites xxxterm.conf -PLIST_DIRS+= share/xxxterm +LICENSE= ISCL + +LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ + soup-2:${PORTSDIR}/devel/libsoup \ + webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 + +USE_PKGCONFIG= yes +USE_PERL5_BUILD=yes +USE_GNOME= gtk20 +INSTALLS_ICONS= yes + +MAKE_ENV= GTK_VERSION="gtk2" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" + +MAN1= xombrero.1 +PORTEXAMPLES= favorites playflash.sh xombrero.conf + +BUILD_WRKSRC= ${WRKSRC}/freebsd + +OPTIONS_DEFINE= EXAMPLES + +SUB_FILES= xombrero .include @@ -35,27 +45,31 @@ BROKEN= does not build due to missing arc4random_buf in libc .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 - -do-build: - (cd ${WRKSRC}/freebsd && make) - +post-patch: + @cd ${WRKSRC}; ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + -e 's|# ssl_ca_file|ssl_ca_file|' \ + -e 's|/etc/ssl/cert.pem|${LOCALBASE}/share/certs/ca-root-nss.crt|' \ + unix.c xombrero.conf do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/freebsd/xxxterm ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/xxxterm.1 ${PREFIX}/man/man1/ - ${MKDIR} ${PREFIX}/share/${PORTNAME} -.for i in ${ICONS} - ${INSTALL_DATA} ${WRKSRC}/xxxtermicon${i}.png ${PREFIX}/share/xxxterm/ + ${INSTALL_SCRIPT} ${WRKDIR}/xombrero ${PREFIX}/bin/xombrero + ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/xombrero ${PREFIX}/bin/xombrero-bin + ${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${MANPREFIX}/man/man1 +.for i in 16 32 48 64 128 + ${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps + ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${PREFIX}/share/icons/hicolor/${i}x${i}/apps +.endfor + ${MKDIR} ${DATADIR} +.for i in style.css tld-rules + ${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/style.css ${PREFIX}/share/xxxterm/ -.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${PREFIX}/share/applications +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/favorites ${EXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKSRC}/xxxterm.conf ${EXAMPLESDIR}/ +.for i in favorites xombrero.conf + ${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR} +.endfor + ${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${EXAMPLESDIR} .endif .include diff -ruN xxxterm/distinfo xombrero/distinfo --- xxxterm/distinfo 2012-08-17 21:34:04.000000000 +0800 +++ xombrero/distinfo 2012-08-17 21:43:57.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/files/patch-freebsd__Makefile xombrero/files/patch-freebsd__Makefile --- xxxterm/files/patch-freebsd__Makefile 1970-01-01 08:00:00.000000000 +0800 +++ xombrero/files/patch-freebsd__Makefile 2012-08-17 21:43:57.000000000 +0800 @@ -0,0 +1,13 @@ +--- ./freebsd/Makefile.orig 2012-07-25 17:37:55.000000000 -0400 ++++ ./freebsd/Makefile 2012-07-31 08:13:02.000000000 -0400 +@@ -9,8 +9,8 @@ + LDADD= -lutil -lgcrypt + GTK_CFLAGS!= pkg-config --cflags $(LIBS) + GTK_LDFLAGS!= pkg-config --libs $(LIBS) +-CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -pthread +-LDFLAGS+= $(GTK_LDFLAGS) -pthread ++CFLAGS+= $(GTK_CFLAGS) -Wall -D_GCRYPT_IN_LIBGCRYPT=1 -I.. ${PTHREAD_CFLAGS} ++LDFLAGS+= $(GTK_LDFLAGS) ${PTHREAD_LIBS} + + PREFIX?= /usr/local + BINDIR?= $(PREFIX)/bin diff -ruN xxxterm/files/patch-xombrero.c xombrero/files/patch-xombrero.c --- xxxterm/files/patch-xombrero.c 1970-01-01 08:00:00.000000000 +0800 +++ xombrero/files/patch-xombrero.c 2012-08-17 21:43:57.000000000 +0800 @@ -0,0 +1,11 @@ +--- ./xombrero.c.orig 2012-07-25 17:37:55.000000000 -0400 ++++ ./xombrero.c 2012-07-31 08:13:02.000000000 -0400 +@@ -1423,7 +1423,7 @@ + { + struct passwd *pwd; + int i; +- char user[LOGIN_NAME_MAX]; ++ char user[sysconf(_SC_LOGIN_NAME_MAX)]; + const char *sc = s; + + if (path == NULL || s == NULL) diff -ruN xxxterm/files/xombrero.in xombrero/files/xombrero.in --- xxxterm/files/xombrero.in 1970-01-01 08:00:00.000000000 +0800 +++ xombrero/files/xombrero.in 2012-08-17 21:43:57.000000000 +0800 @@ -0,0 +1,20 @@ +#!/bin/sh + +# A wrapper script for xombrero +# Created by HU Dong + +if [ ! -d "~/.xombrero" ]; then + mkdir -p -m 700 ~/.xombrero +fi + +if [ ! -f "~/.xombrero.conf" ]; then + cp %%EXAMPLESDIR%%/xombrero.conf ~/.xombrero.conf + chmod +w ~/.xombrero.conf +fi + +if [ ! -f "~/.xombrero/playflash.sh" ]; then + cp %%EXAMPLESDIR%%/playflash.sh ~/.xombrero/playflash.sh + chmod +x ~/.xombrero/playflash.sh +fi + +exec %%PREFIX%%/bin/xombrero-bin diff -ruN xxxterm/pkg-descr xombrero/pkg-descr --- xxxterm/pkg-descr 2012-08-17 21:34:04.000000000 +0800 +++ xombrero/pkg-descr 2012-08-17 21:43:57.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-08-17 21:43:58.000000000 +0800 @@ -0,0 +1,24 @@ +bin/xombrero +bin/xombrero-bin +share/applications/xombrero.desktop +share/icons/hicolor/128x128/apps/xombreroicon128.png +share/icons/hicolor/16x16/apps/xombreroicon16.png +share/icons/hicolor/32x32/apps/xombreroicon32.png +share/icons/hicolor/48x48/apps/xombreroicon48.png +share/icons/hicolor/64x64/apps/xombreroicon64.png +%%DATADIR%%/style.css +%%DATADIR%%/tld-rules +@dirrm %%DATADIR%% +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/applications