Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Dec 2011 21:12:24 GMT
From:      Aragon Gouveia <aragon@phat.za.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/163071: [patch] x11/evilvte version upgrade 0.5.0
Message-ID:  <201112042112.pB4LCONZ038710@red.freebsd.org>
Resent-Message-ID: <201112042120.pB4LK9I1078706@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163071
>Category:       ports
>Synopsis:       [patch] x11/evilvte version upgrade 0.5.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 04 21:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Aragon Gouveia
>Release:        9.0-RC2
>Organization:
>Environment:
FreeBSD igor.geek.sh 9.0-RC2 FreeBSD 9.0-RC2 #0: Sat Nov 12 18:35:25 UTC 2011     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Attached patch updates x11/evilvte to the latest version.

Thanks.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -uNr evilvte/Makefile evilvte.new/Makefile
--- evilvte/Makefile	2010-11-03 20:29:19.000000000 +0200
+++ evilvte.new/Makefile	2011-12-04 21:08:32.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evilvte
-PORTVERSION=	0.4.7.1
+PORTVERSION=	0.5.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.calno.com/${PORTNAME}/ \
 		LOCAL/glarkin
@@ -14,6 +14,7 @@
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	A VTE based, super lightweight terminal emulator
 
+USE_XZ=		yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	evilvte
@@ -39,7 +40,7 @@
 
 post-patch:
 #	 disable man page installation
-	@${REINPLACE_CMD} -e '37,38 d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '59,60 d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^make/ s/make/gmake/' ${WRKSRC}/src/process.sh
 .if defined(EVILVTE_CONF)
 	@${ECHO_MSG} "creating config.h from ${EVILVTE_CONF}"
diff -uNr evilvte/distinfo evilvte.new/distinfo
--- evilvte/distinfo	2011-03-19 14:37:43.000000000 +0200
+++ evilvte.new/distinfo	2011-12-04 14:34:14.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (evilvte-0.4.7.1.tar.gz) = a47ad312fde918a7064f37a933a66eeb8c252190224d06a8b804911ad5cdacf0
-SIZE (evilvte-0.4.7.1.tar.gz) = 39142
+SHA256 (evilvte-0.5.0.tar.xz) = 8d32dd9f3b192e00c8111c406a90cc0da2e674e0f8c5a03854287d384e7edea8
+SIZE (evilvte-0.5.0.tar.xz) = 58436
diff -uNr evilvte/files/patch-src-process.sh evilvte.new/files/patch-src-process.sh
--- evilvte/files/patch-src-process.sh	2010-11-03 20:29:19.000000000 +0200
+++ evilvte.new/files/patch-src-process.sh	2011-12-04 22:47:53.000000000 +0200
@@ -1,28 +1,11 @@
---- src/process.sh.orig	2010-10-06 08:19:31.000000000 +0200
-+++ src/process.sh	2010-11-02 21:09:49.000000000 +0200
-@@ -19,11 +19,11 @@
- grep ^#define src/config.o > $CONFFILE
- rm -f $1 src/evilvte.o
+--- src/process.sh.orig	2011-12-04 22:40:02.000000000 +0200
++++ src/process.sh	2011-12-04 22:42:40.000000000 +0200
+@@ -147,7 +147,7 @@
  
--MENU_DEFAULT_ENCODING=`grep   MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
--MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
--TOGGLE_BG_ORDER_SIZE=`grep    TOGGLE_BG_ORDER    src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
--MENU_CUSTOM_SIZE=`grep        MENU_CUSTOM        src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
--UPPER_PROGRAM_NAME=`grep      PROGRAM_NAME       src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | sed 's/\b\(.\)/\u\1/'`
-+MENU_DEFAULT_ENCODING=`grep   MENU_ENCODING_LIST src/custom.h | tr '\t' ' ' | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
-+MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
-+TOGGLE_BG_ORDER_SIZE=`grep    TOGGLE_BG_ORDER    src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
-+MENU_CUSTOM_SIZE=`grep        MENU_CUSTOM        src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
-+UPPER_PROGRAM_NAME=`grep      PROGRAM_NAME       src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | tr '[:lower:]' '[:upper:]'`
- [ "$MENU_DEFAULT_ENCODING" != "" ]    && echo \#define MENU_DEFAULT_ENCODING   1                        >> $CONFFILE
- [ "$MENU_ENCODING_LIST_SIZE" != "0" ] && echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $CONFFILE
- [ "$TOGGLE_BG_ORDER_SIZE" != "0" ]    && echo \#define TOGGLE_BG_ORDER_SIZE    $TOGGLE_BG_ORDER_SIZE    >> $CONFFILE
-@@ -52,7 +52,7 @@
- [ "$TOGGLE_BG_NO_BACKGROUND" != "" ] && echo \#define TOGGLE_BG_NO_BACKGROUND 1 >> $CONFFILE
- [ "$TOGGLE_BG_OPACITY" != "" ]       && echo \#define TOGGLE_BG_OPACITY       1 >> $CONFFILE
+ head -n 1 $0 > src/showvte
+ tail -n 6 $0 | grep -v ^grep >> src/showvte
+-cat src/custom.h | tr '\t' ' ' | tr -s ' ' ' ' | sed -e 's/^ //' -e 's~/\*~\n~g' | grep ^\#define >> src/showvte
++grep ^\#define src/custom.h | tr '\t' ' ' | tr -s ' ' ' ' | sed -e 's/^ //' -e 's;/\*.*$;;g' >>src/showvte
  
--MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
-+MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
- 
- MENU_COPY=`echo $MENU_CUSTOM_DEFINE | grep Copy`
- [ "$MENU_COPY" != "" ] && echo \#define MENU_COPY 1 >> $CONFFILE
+ SHOWVTE_PROG_NAME=`grep PROGRAM_NAME    src/custom.h | tr '\t' ' ' | sed 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2`
+ [ "$SHOWVTE_PROG_NAME" = "" ] && SHOWVTE_PROG_NAME="evilvte"
diff -uNr evilvte/pkg-plist evilvte.new/pkg-plist
--- evilvte/pkg-plist	2010-05-04 12:57:16.000000000 +0200
+++ evilvte.new/pkg-plist	2011-12-04 21:15:03.000000000 +0200
@@ -2,6 +2,21 @@
 bin/showvte
 share/applications/evilvte.desktop
 share/pixmaps/evilvte.png
+share/icons/hicolor/16x16/apps/evilvte.png
+share/icons/hicolor/20x20/apps/evilvte.png
+share/icons/hicolor/22x22/apps/evilvte.png
+share/icons/hicolor/24x24/apps/evilvte.png
+share/icons/hicolor/32x32/apps/evilvte.png
+share/icons/hicolor/36x36/apps/evilvte.png
+share/icons/hicolor/40x40/apps/evilvte.png
+share/icons/hicolor/48x48/apps/evilvte.png
+share/icons/hicolor/64x64/apps/evilvte.png
+share/icons/hicolor/72x72/apps/evilvte.png
+share/icons/hicolor/96x96/apps/evilvte.png
+share/icons/hicolor/scalable/apps/evilvte.svg
 share/gnome-control-center/default-apps/evilvte.xml
 @dirrmtry share/applications
+@dirrmtry share/pixmaps
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry share/gnome-control-center/default-apps


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112042112.pB4LCONZ038710>