From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 26 12:50:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64D2516A401 for ; Wed, 26 Apr 2006 12:50:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1424643D53 for ; Wed, 26 Apr 2006 12:50:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3QCoDOw051203 for ; Wed, 26 Apr 2006 12:50:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3QCoDnd051202; Wed, 26 Apr 2006 12:50:13 GMT (envelope-from gnats) Resent-Date: Wed, 26 Apr 2006 12:50:13 GMT Resent-Message-Id: <200604261250.k3QCoDnd051202@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lars Engels Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6C1B16A400 for ; Wed, 26 Apr 2006 12:47:32 +0000 (UTC) (envelope-from lars@bart.bsd-geek.de) Received: from bart.bsd-geek.de (dslb-084-063-013-158.pools.arcor-ip.net [84.63.13.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id A695543D48 for ; Wed, 26 Apr 2006 12:47:30 +0000 (GMT) (envelope-from lars@bart.bsd-geek.de) Received: from bart.bsd-geek.de (localhost.bsd-geek.de [127.0.0.1]) by bart.bsd-geek.de (8.13.4/8.13.4) with ESMTP id k3QClLee042898 for ; Wed, 26 Apr 2006 14:47:22 +0200 (CEST) (envelope-from lars@bart.bsd-geek.de) Received: (from root@localhost) by bart.bsd-geek.de (8.13.4/8.13.4/Submit) id k3QClLnl042897; Wed, 26 Apr 2006 14:47:21 +0200 (CEST) (envelope-from lars) Message-Id: <200604261247.k3QClLnl042897@bart.bsd-geek.de> Date: Wed, 26 Apr 2006 14:47:21 +0200 (CEST) From: Lars Engels To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96361: [New Port] x11/mrxvt-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Apr 2006 12:50:15 -0000 >Number: 96361 >Category: ports >Synopsis: [New Port] x11/mrxvt-devel >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 26 12:50:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Lars Engels >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD bart.bsd-geek.de 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Sat Apr 1 14:14:13 CEST 2006 lars@bart.bsd-geek.de:/usr/obj/usr/src/sys/BART i386 >Description: Add the development version of mrxvt. Below you find the shar file for the new port and a diff for x11/mrxvt that adds CONFLICTS with mrxvt-devel. >How-To-Repeat: >Fix: --- mrxvt-devel-0.5.0.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # x11/mrxvt-devel/ # x11/mrxvt-devel/files # x11/mrxvt-devel/files/patch-src-main.c # x11/mrxvt-devel/files/patch-src-strings.c # x11/mrxvt-devel/Makefile # x11/mrxvt-devel/pkg-plist # x11/mrxvt-devel/pkg-descr # x11/mrxvt-devel/distinfo # echo c - x11/mrxvt-devel/ mkdir -p x11/mrxvt-devel/ > /dev/null 2>&1 echo c - x11/mrxvt-devel/files mkdir -p x11/mrxvt-devel/files > /dev/null 2>&1 echo x - x11/mrxvt-devel/files/patch-src-main.c sed 's/^X//' >x11/mrxvt-devel/files/patch-src-main.c << 'END-of-x11/mrxvt-devel/files/patch-src-main.c' X--- src/main.c.orig Fri Jul 22 19:42:38 2005 X+++ src/main.c Fri Jul 22 19:43:03 2005 X@@ -1568,7 +1568,7 @@ X void X rxvt_set_utf8_property (rxvt_t* r, Atom prop, Window win, const char* str) X { X-#ifdef HAVE_WCHAR_H X+#ifdef HAVE_WCHAR_H && _FreeBSD_version >= 500000 X wchar_t* ws = rxvt_mbstowcs (str); X char* s = rxvt_wcstoutf8 (ws); X END-of-x11/mrxvt-devel/files/patch-src-main.c echo x - x11/mrxvt-devel/files/patch-src-strings.c sed 's/^X//' >x11/mrxvt-devel/files/patch-src-strings.c << 'END-of-x11/mrxvt-devel/files/patch-src-strings.c' X--- src/strings.c.orig Fri Jul 22 19:49:43 2005 X+++ src/strings.c Fri Jul 22 19:50:40 2005 X@@ -44,6 +44,7 @@ X X #ifdef HAVE_WCHAR_H X /* EXTPROTO */ X+#if _FreeBSD_version >= 500000 X char* X rxvt_wcstombs (const wchar_t* str, int len) X { X@@ -70,6 +71,7 @@ X X return r; X } X+#endif X X X /* EXTPROTO */ END-of-x11/mrxvt-devel/files/patch-src-strings.c echo x - x11/mrxvt-devel/Makefile sed 's/^X//' >x11/mrxvt-devel/Makefile << 'END-of-x11/mrxvt-devel/Makefile' X# New ports collection makefile for: mrxvt-devel X# Date created: 24 Apr 2005 X# Whom: Lars Engels X# X# $FreeBSD$ X# X XPORTNAME= mrxvt-devel XPORTVERSION= 0.5.0 XCATEGORIES= x11 XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR= materm XDISTNAME= mrxvt-${PORTVERSION} X XMAINTAINER= lars.engels@0x20.net XCOMMENT= Development version of mrxvt X XLIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ X png.5:${PORTSDIR}/graphics/png X XCONFLICTS= mrxvt-0.4.* X XUSE_X_PREFIX= yes XGNU_CONFIGURE= yes X XMAN1= mrxvt.1 X XOPTIONS= XFT "Enable Xft support for fonts" Off \ X JAPANESE "Enable support for Japanese language" Off \ X 24BITS "Prefer 24 bits color" On \ X MENUBAR "Enable menubar" On \ X TEXTSHADOW "Enable text shadow" Off X X.include X X.if defined(WITH_JAPANESE) XCONFIGURE_ARGS+= --enable-xim --enable-cjk --with-encoding=eucj X.endif X X.if defined(WITH_XFT) XLIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft XCONFIGURE_ARGS+= --enable-xft X.endif X X.if defined(WITH_24BITS) XCONFIGURE_ARGS+= --enable-24bits X.endif X X.if defined(WITH_MENUBAR) XCONFIGURE_ARGS+= --enable-menubar X.endif X X.if defined(WITH_TEXTSHADOW) XCONFIGURE_ARGS+= --enable-text-shadow X.endif X XCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ X LIBS="${LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin X ${MKDIR} ${PREFIX}/share/pixmaps X @for pixmap in ${WRKSRC}/share/pixmaps/* ; \ X do ${INSTALL_DATA} $$pixmap ${PREFIX}/share/pixmaps/ ; \ X done X ${MKDIR} ${PREFIX}/etc/mrxvt X ${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${PREFIX}/etc/mrxvt/mrxvtrc.sample X ${INSTALL_DATA} ${WRKSRC}/share/default.menu ${PREFIX}/etc/mrxvt/default.menu.sample X ${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${PREFIX}/etc/mrxvt/submenus.menu.sample X ${MKDIR} ${EXAMPLESDIR}/scripts X ${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${EXAMPLESDIR}/scripts X ${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${EXAMPLESDIR}/scripts X ${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${MANPREFIX}/man/man1 X Xpost-install: X.if !defined(NOPORTDOCS) X ${MKDIR} ${DOCSDIR} X ${CP} ${WRKSRC}/doc/*.bz2 ${DOCSDIR} X ${BZIP2_CMD} -d ${DOCSDIR}/*.bz2 X.endif X @${ECHO_MSG} "=======================================================================" X @${ECHO_MSG} "" X @${ECHO_MSG} " Sample configuration files have been installed to ${PREFIX}/etc/mrxvt" X @${ECHO_MSG} " Useful scripts have been installed to ${EXAMPLESDIR}/scripts" X @${ECHO_MSG} "" X @${ECHO_MSG} "=======================================================================" X X.include END-of-x11/mrxvt-devel/Makefile echo x - x11/mrxvt-devel/pkg-plist sed 's/^X//' >x11/mrxvt-devel/pkg-plist << 'END-of-x11/mrxvt-devel/pkg-plist' Xbin/mrxvt Xshare/pixmaps/mrxvt-csh.png Xshare/pixmaps/mrxvt-csh.xpm Xshare/pixmaps/mrxvt-root.png Xshare/pixmaps/mrxvt-root.xpm Xshare/pixmaps/mrxvt.png Xshare/pixmaps/mrxvt.xpm X%%EXAMPLESDIR%%/scripts/mrxvtset.pl X%%EXAMPLESDIR%%/scripts/settitle.c X%%DOCSDIR%%/README.greek X%%DOCSDIR%%/README.xvt X%%DOCSDIR%%/hack-mrxvt.txt X%%DOCSDIR%%/rxvtRef.txt X%%DOCSDIR%%/README.menu X%%DOCSDIR%%/behind_mrxvt.txt X%%DOCSDIR%%/mrxvt_seq.txt X%%DOCSDIR%%/xterm-ctlseqs.txt X@dirrmtry share/pixmaps X@dirrm %%EXAMPLESDIR%%/scripts X@dirrm %%EXAMPLESDIR%% X%%PORTDOCS%%@dirrm %%DOCSDIR%% END-of-x11/mrxvt-devel/pkg-plist echo x - x11/mrxvt-devel/pkg-descr sed 's/^X//' >x11/mrxvt-devel/pkg-descr << 'END-of-x11/mrxvt-devel/pkg-descr' XMrxvt (previously named as materm) is a lightweight and powerful Xmulti-tabbed X terminal emulator based on the popular rxvt and Xaterm. It implements many useful features seen in some modern X Xterminal emulators, like gnome-terminal and konsole, but keep to Xbe lightweight and independent from the GNOME and KDE desktop Xenvironment. The following are the major features of mrxvt (* are Xnew features compared with rxvt, + are enhanced features compared Xwith rxvt): X XWWW: http://materm.sourceforge.net/ X X- Lars Engels Xlars.engels@0x20.net END-of-x11/mrxvt-devel/pkg-descr echo x - x11/mrxvt-devel/distinfo sed 's/^X//' >x11/mrxvt-devel/distinfo << 'END-of-x11/mrxvt-devel/distinfo' XMD5 (mrxvt-0.5.0.tar.gz) = ee0e6f5d7afaddfd399ae174f6adfcef XSHA256 (mrxvt-0.5.0.tar.gz) = 0c99edffab6293913c40c2d538d6f72059fed28571cf967350bdc87b553fbead XSIZE (mrxvt-0.5.0.tar.gz) = 592847 END-of-x11/mrxvt-devel/distinfo exit --- mrxvt-devel-0.5.0.shar ends here --- --- mrxvt-0.4.2.diff begins here --- diff -Nur x11/mrxvt.orig/Makefile x11/mrxvt/Makefile --- x11/mrxvt.orig/Makefile Wed Apr 26 14:40:58 2006 +++ x11/mrxvt/Makefile Wed Apr 26 14:41:52 2006 @@ -18,6 +18,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png +CONFLICTS= mrxvt-0.5.* + USE_X_PREFIX= yes GNU_CONFIGURE= yes --- mrxvt-0.4.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: