From nobody@FreeBSD.org  Mon Nov 26 17:59:48 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E48B9C91
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 17:59:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id CA30F8FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 17:59:48 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQHxmXU038142
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 17:59:48 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qAQHxmcH038141;
	Mon, 26 Nov 2012 17:59:48 GMT
	(envelope-from nobody)
Message-Id: <201211261759.qAQHxmcH038141@red.freebsd.org>
Date: Mon, 26 Nov 2012 17:59:48 GMT
From: Matthew Donovan <kitche@kitchetech.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [Maintainer Patch] Sterm 0.3 upgrade
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173941
>Category:       ports
>Synopsis:       [Maintainer Patch] Sterm 0.3 upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 26 18:00:00 UTC 2012
>Closed-Date:    Tue Nov 27 13:10:51 UTC 2012
>Last-Modified:  Tue Nov 27 13:10:51 UTC 2012
>Originator:     Matthew Donovan
>Release:        Current
>Organization:
>Environment:
FreeBSD laptop.kitchetech.com 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r241571: Sun Oct 14 22:51:41 CDT 2012     root@laptop.kitchetech.com:/usr/obj/usr/src/sys/DEMONEDGE  amd64

>Description:
Patch for sterm patch to 0.3
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ru sterm/Makefile sterm.orig/Makefile
--- sterm/Makefile	2012-11-26 11:48:55.000000000 -0600
+++ sterm.orig/Makefile	2012-11-26 11:48:24.000000000 -0600
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sterm
-PORTVERSION=	0.3
+PORTVERSION=	0.2.1
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/st/
 DISTNAME=	st-${PORTVERSION}
diff -ru sterm/distinfo sterm.orig/distinfo
--- sterm/distinfo	2012-11-26 11:49:08.000000000 -0600
+++ sterm.orig/distinfo	2012-11-26 11:48:24.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (st-0.3.tar.gz) = 6d6ca8e8a110530caf97538eab96f0ec28ad2dc419054afeea91e8187b940e34
-SIZE (st-0.3.tar.gz) = 24424
+SHA256 (st-0.2.1.tar.gz) = 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897
+SIZE (st-0.2.1.tar.gz) = 19804


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Mon Nov 26 19:42:00 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173941 
State-Changed-From-To: open->feedback 
State-Changed-By: madpilot 
State-Changed-When: Mon Nov 26 21:43:43 UTC 2012 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173941 

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, kitche@kitchetech.com
Cc:  
Subject: Re: ports/173941: [Maintainer Patch] Sterm 0.3 upgrade
Date: Mon, 26 Nov 2012 22:43:29 +0100

 This is a multi-part message in MIME format.
 --------------070801000605070405090104
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 Please note that the patch you sent is reversed.
 
 Also it is only partial. The new version of sterm seems to have grown 
 some new dependencies. Patch files don't apply anymore either.
 
 I have fixed these problems and also changed the check on NOPORTDOCS to 
 the DOCS option, so to be compliant with the new options framework.
 
 Also trimmed the Makefile header.
 
 Attaching a patch for your approval.
 
 Thank you.
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>
 
 --------------070801000605070405090104
 Content-Type: text/plain; charset=us-ascii;
  name="sterm.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="sterm.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 307793)
 +++ Makefile	(working copy)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	sterm
 -# Date created:			April 01, 2011
 -# Whom:				Matthew Donovan <kitchetech@gmail.com>
 -#
 +# Created by: Matthew Donovan <kitchetech@gmail.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	sterm
 -PORTVERSION=	0.2.1
 +PORTVERSION=	0.3
  CATEGORIES=	x11
  MASTER_SITES=	http://dl.suckless.org/st/
  DISTNAME=	st-${PORTVERSION}
 @@ -16,14 +12,18 @@
  
  LICENSE=	BSD
  
 +LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 +		freetype:${PORTSDIR}/print/freetype2
  RUN_DEPENDS=	${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses
  
 -USE_XORG=	x11
 +USE_XORG=	x11 xext xft
  MAN1=	st.1
  PLIST_FILES=	bin/st
  
  PORTDOCS=	README
  
 +.include <bsd.port.options.mk>
 +
  pre-everything::
  	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
  	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"
 @@ -42,7 +42,7 @@
  		${WRKSRC}/config.mk
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  .for doc in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 307793)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (st-0.2.1.tar.gz) = 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897
 -SIZE (st-0.2.1.tar.gz) = 19804
 +SHA256 (st-0.3.tar.gz) = 6d6ca8e8a110530caf97538eab96f0ec28ad2dc419054afeea91e8187b940e34
 +SIZE (st-0.3.tar.gz) = 24424
 Index: files/patch-Makefile
 ===================================================================
 --- files/patch-Makefile	(revision 307793)
 +++ files/patch-Makefile	(working copy)
 @@ -1,9 +1,9 @@
 ---- Makefile.orig	2011-04-06 14:22:13.614498469 +0200
 -+++ Makefile	2011-04-06 14:23:02.470588628 +0200
 -@@ -48,7 +48,7 @@
 - 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 - 	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
 +--- Makefile.orig	2012-11-02 20:09:49.000000000 +0100
 ++++ Makefile	2012-11-26 21:33:04.882099791 +0100
 +@@ -50,7 +50,7 @@
   	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
 + 	@echo If things do not seem to work, be sure that there is no \
 + 		floating st terminfo in the .terminfo directory in your home dir.
  -	@tic -s st.info
  +	@tic -s -o ${LOCALBASE}/share/misc st.info
   
 Index: files/patch-config.mk
 ===================================================================
 --- files/patch-config.mk	(revision 307793)
 +++ files/patch-config.mk	(working copy)
 @@ -1,21 +1,11 @@
 ---- config.mk.orig	2011-01-23 12:30:01.000000000 +0100
 -+++ config.mk	2011-04-06 14:25:05.291720015 +0200
 -@@ -5,6 +5,7 @@
 +--- config.mk.orig	2012-11-02 20:09:49.000000000 +0100
 ++++ config.mk	2012-11-26 22:28:12.270095047 +0100
 +@@ -11,7 +11,7 @@
 + X11LIB = /usr/X11R6/lib
   
 - # paths
 - PREFIX = /usr/local
 -+LOCALBASE= /usr/local
 - MANPREFIX = ${PREFIX}/share/man
 + # includes and libs
 +-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
 ++INCS = -I. -I/usr/include -I${X11INC} -I${X11INC}/freetype2
 + LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
   
 - X11INC = /usr/X11R6/include
 -@@ -16,8 +17,8 @@
 - 
   # flags
 - CPPFLAGS = -DVERSION=\"${VERSION}\"
 --CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 --LDFLAGS += -s ${LIBS}
 -+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
 -+LDFLAGS += ${LIBS}
 - 
 - # compiler and linker
 - CC ?= cc
 
 --------------070801000605070405090104--

From: Matthew Donovan <kitche@kitchetech.com>
To: Guido Falsi <madpilot@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/173941: [Maintainer Patch] Sterm 0.3 upgrade
Date: Tue, 27 Nov 2012 01:45:07 -0600

 --14dae93404f5951d0604cf753ae1
 Content-Type: text/plain; charset=ISO-8859-1
 
 Patch is fine. I tested my port earlier must have missed the font
 dependency, as port built fine on my tinderbox,
 On Nov 26, 2012 3:43 PM, "Guido Falsi" <madpilot@freebsd.org> wrote:
 
 > Hi,
 >
 > Please note that the patch you sent is reversed.
 >
 > Also it is only partial. The new version of sterm seems to have grown some
 > new dependencies. Patch files don't apply anymore either.
 >
 > I have fixed these problems and also changed the check on NOPORTDOCS to
 > the DOCS option, so to be compliant with the new options framework.
 >
 > Also trimmed the Makefile header.
 >
 > Attaching a patch for your approval.
 >
 > Thank you.
 >
 > --
 > Guido Falsi <madpilot@FreeBSD.org>
 >
 
 --14dae93404f5951d0604cf753ae1
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <p>Patch is fine. I tested my port earlier must have missed the font depend=
 ency, as port built fine on my tinderbox, </p>
 <div class=3D"gmail_quote">On Nov 26, 2012 3:43 PM, &quot;Guido Falsi&quot;=
  &lt;<a href=3D"mailto:madpilot@freebsd.org">madpilot@freebsd.org</a>&gt; w=
 rote:<br type=3D"attribution"><blockquote class=3D"gmail_quote" style=3D"ma=
 rgin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 Hi,<br>
 <br>
 Please note that the patch you sent is reversed.<br>
 <br>
 Also it is only partial. The new version of sterm seems to have grown some =
 new dependencies. Patch files don&#39;t apply anymore either.<br>
 <br>
 I have fixed these problems and also changed the check on NOPORTDOCS to the=
  DOCS option, so to be compliant with the new options framework.<br>
 <br>
 Also trimmed the Makefile header.<br>
 <br>
 Attaching a patch for your approval.<br>
 <br>
 Thank you.<br>
 <br>
 -- <br>
 Guido Falsi &lt;madpilot@FreeBSD.org&gt;<br>
 </blockquote></div>
 
 --14dae93404f5951d0604cf753ae1--
State-Changed-From-To: feedback->closed 
State-Changed-By: madpilot 
State-Changed-When: Tue Nov 27 13:10:50 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173941 
>Unformatted:
