From phil@home.nixil.net  Fri Sep  1 09:40:43 2006
Return-Path: <phil@home.nixil.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 72ADA16A4DD
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  1 Sep 2006 09:40:43 +0000 (UTC)
	(envelope-from phil@home.nixil.net)
Received: from home.nixil.net (c-24-10-219-57.hsd1.ut.comcast.net [24.10.219.57])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9FE643D45
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  1 Sep 2006 09:40:42 +0000 (GMT)
	(envelope-from phil@home.nixil.net)
Received: from home.nixil.net (localhost [127.0.0.1])
	by home.nixil.net (8.13.6/8.13.6) with ESMTP id k819efOA060886
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 1 Sep 2006 03:40:41 -0600 (MDT)
	(envelope-from phil@home.nixil.net)
Received: (from root@localhost)
	by home.nixil.net (8.13.6/8.13.6/Submit) id k819eaXx060885;
	Fri, 1 Sep 2006 03:40:36 -0600 (MDT)
	(envelope-from phil)
Message-Id: <200609010940.k819eaXx060885@home.nixil.net>
Date: Fri, 1 Sep 2006 03:40:36 -0600 (MDT)
From: oz@nixil.net
Reply-To: oz@nixil.net
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer-Update] Upgrade mail/reply-o-matic to 1.4.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         102743
>Category:       ports
>Synopsis:       [Maintainer-Update] Upgrade mail/reply-o-matic to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 01 09:50:17 GMT 2006
>Closed-Date:    Mon Sep 04 18:54:27 GMT 2006
>Last-Modified:  Mon Sep 04 18:54:27 GMT 2006
>Originator:     Phil Oleson
>Release:        FreeBSD 5.5-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD home.nixil.net 5.5-STABLE FreeBSD 5.5-STABLE #3: Thu Jul 20 16:13:18 MDT 2006 root@home.nixil.net:/usr/obj/usr/src/sys/home i386


>Description:
	Upgrading reply-o-matic to it's latest version 1.4.1
>How-To-Repeat:
	N/A
>Fix:

--- rom-patch begins here ---
diff -ruN reply-o-matic.orig/Makefile reply-o-matic/Makefile
--- reply-o-matic.orig/Makefile	Fri Sep  1 03:24:01 2006
+++ reply-o-matic/Makefile	Fri Sep  1 03:32:43 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	reply-o-matic
-PORTVERSION=	1.2.0
+PORTVERSION=	1.4.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,6 +15,9 @@
 COMMENT=	A highly configureble, secure, auto reply software
 
 MAN1=		rom.1
+
+PLIST_FILES=    sbin/rom \
+		etc/rom/.rates
 
 post-patch:
 	@${REINPLACE_CMD} \
diff -ruN reply-o-matic.orig/distinfo reply-o-matic/distinfo
--- reply-o-matic.orig/distinfo	Fri Sep  1 03:24:01 2006
+++ reply-o-matic/distinfo	Fri Sep  1 03:24:28 2006
@@ -1,3 +1,3 @@
-MD5 (reply-o-matic-1.2.0.tar.gz) = 770eee68bed7da27fed35afc95f1e205
-SHA256 (reply-o-matic-1.2.0.tar.gz) = 2603558abf1996796483675e6b0da96bdce537ed55273b5ba45d0b7800eb8e2a
-SIZE (reply-o-matic-1.2.0.tar.gz) = 26483
+MD5 (reply-o-matic-1.4.1.tar.gz) = 4b6f97c7ded8fc46eebdb0e1597eea13
+SHA256 (reply-o-matic-1.4.1.tar.gz) = d266f776803d0fdf61702fd9fcd5d3c62d41b0db0797736a6eaa5b841ed27722
+SIZE (reply-o-matic-1.4.1.tar.gz) = 26983
diff -ruN reply-o-matic.orig/files/patch-Makefile reply-o-matic/files/patch-Makefile
--- reply-o-matic.orig/files/patch-Makefile	Fri Sep  1 03:24:01 2006
+++ reply-o-matic/files/patch-Makefile	Fri Sep  1 03:34:46 2006
@@ -1,16 +1,17 @@
---- Makefile.orig	Tue Nov 25 18:41:39 2003
-+++ Makefile	Thu May 13 19:34:50 2004
-@@ -1,7 +1,5 @@
+--- Makefile.orig	Sun Aug 20 01:06:42 2006
++++ Makefile	Fri Sep  1 03:34:30 2006
+@@ -1,7 +1,7 @@
 -INSTALL_PREFIX=
 -MAN1=/usr/share/man/man1/
--
--CFLAGS=-g -O2
 +INSTALL_PREFIX=${PREFIX}
 +MAN1=/man/man1/
  
+-CFLAGS=-Wall -O2
++#CFLAGS=-Wall -O2
+ 
  all: main.o base64.o
  	$(CC) $(CFLAGS) -o rom main.o base64.o
-@@ -9,10 +7,10 @@
+@@ -9,10 +9,10 @@
  clean:
  	@rm -f rom *.o core
  install:
@@ -19,7 +20,7 @@
  	install -d -m 755 $(INSTALL_PREFIX)/etc/rom
  	install -d -m 1755 $(INSTALL_PREFIX)/etc/rom/.rates
 -	install -m 755 rom $(INSTALL_PREFIX)/usr/sbin/
-+	install -m 755 rom $(INSTALL_PREFIX)/sbin
++	install -m 755 rom $(INSTALL_PREFIX)/sbin/
  	install -d -m 755 $(INSTALL_PREFIX)$(MAN1)
  	install -m 755 rom.1 $(INSTALL_PREFIX)$(MAN1)
  
diff -ruN reply-o-matic.orig/files/patch-main.c reply-o-matic/files/patch-main.c
--- reply-o-matic.orig/files/patch-main.c	Fri Sep  1 03:24:01 2006
+++ reply-o-matic/files/patch-main.c	Wed Dec 31 17:00:00 1969
@@ -1,20 +0,0 @@
---- main.c.orig	Thu May 13 18:44:13 2004
-+++ main.c	Thu May 13 18:44:46 2004
-@@ -929,7 +929,7 @@
- 		case -1: 
- 			 diedie(2);
- 			 break;
--		default:
-+/*		default: */
- 	}
- 	if ( forwardto[0] != 0 ) {
- 		pipe(dfd);
-@@ -966,7 +966,7 @@
- 			case -1: 
- 				 diedie(2);
- 				 break;
--			default:
-+/*			default: */
- 		}
- 	}
- 
diff -ruN reply-o-matic.orig/pkg-plist reply-o-matic/pkg-plist
--- reply-o-matic.orig/pkg-plist	Fri Sep  1 03:24:01 2006
+++ reply-o-matic/pkg-plist	Wed Dec 31 17:00:00 1969
@@ -1,3 +0,0 @@
-sbin/rom
-@dirrm etc/rom/.rates
-@dirrm etc/rom
--- rom-patch ends here ---


>Release-Note:
>Audit-Trail:

From: Phil Oleson <oz@nixil.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/102743 : [Maintainer-Update] Upgrade mail/reply-o-matic
 to 1.4.1
Date: Fri, 01 Sep 2006 04:26:26 -0600

 This is a multi-part message in MIME format.
 --------------060903070801040303020502
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Blah.. I botched the pkg_plist change I made in the previous patch.
 Attached is a corrected version.
 
 
 --------------060903070801040303020502
 Content-Type: text/plain;
  name="rom-patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="rom-patch"
 
 diff -ruN reply-o-matic.orig/Makefile reply-o-matic/Makefile
 --- reply-o-matic.orig/Makefile	Fri Sep  1 03:24:01 2006
 +++ reply-o-matic/Makefile	Fri Sep  1 03:44:42 2006
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	reply-o-matic
 -PORTVERSION=	1.2.0
 +PORTVERSION=	1.4.1
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 diff -ruN reply-o-matic.orig/distinfo reply-o-matic/distinfo
 --- reply-o-matic.orig/distinfo	Fri Sep  1 03:24:01 2006
 +++ reply-o-matic/distinfo	Fri Sep  1 03:24:28 2006
 @@ -1,3 +1,3 @@
 -MD5 (reply-o-matic-1.2.0.tar.gz) = 770eee68bed7da27fed35afc95f1e205
 -SHA256 (reply-o-matic-1.2.0.tar.gz) = 2603558abf1996796483675e6b0da96bdce537ed55273b5ba45d0b7800eb8e2a
 -SIZE (reply-o-matic-1.2.0.tar.gz) = 26483
 +MD5 (reply-o-matic-1.4.1.tar.gz) = 4b6f97c7ded8fc46eebdb0e1597eea13
 +SHA256 (reply-o-matic-1.4.1.tar.gz) = d266f776803d0fdf61702fd9fcd5d3c62d41b0db0797736a6eaa5b841ed27722
 +SIZE (reply-o-matic-1.4.1.tar.gz) = 26983
 diff -ruN reply-o-matic.orig/files/patch-Makefile reply-o-matic/files/patch-Makefile
 --- reply-o-matic.orig/files/patch-Makefile	Fri Sep  1 03:24:01 2006
 +++ reply-o-matic/files/patch-Makefile	Fri Sep  1 03:34:46 2006
 @@ -1,16 +1,17 @@
 ---- Makefile.orig	Tue Nov 25 18:41:39 2003
 -+++ Makefile	Thu May 13 19:34:50 2004
 -@@ -1,7 +1,5 @@
 +--- Makefile.orig	Sun Aug 20 01:06:42 2006
 ++++ Makefile	Fri Sep  1 03:34:30 2006
 +@@ -1,7 +1,7 @@
  -INSTALL_PREFIX=
  -MAN1=/usr/share/man/man1/
 --
 --CFLAGS=-g -O2
  +INSTALL_PREFIX=${PREFIX}
  +MAN1=/man/man1/
   
 +-CFLAGS=-Wall -O2
 ++#CFLAGS=-Wall -O2
 + 
   all: main.o base64.o
   	$(CC) $(CFLAGS) -o rom main.o base64.o
 -@@ -9,10 +7,10 @@
 +@@ -9,10 +9,10 @@
   clean:
   	@rm -f rom *.o core
   install:
 @@ -19,7 +20,7 @@
   	install -d -m 755 $(INSTALL_PREFIX)/etc/rom
   	install -d -m 1755 $(INSTALL_PREFIX)/etc/rom/.rates
  -	install -m 755 rom $(INSTALL_PREFIX)/usr/sbin/
 -+	install -m 755 rom $(INSTALL_PREFIX)/sbin
 ++	install -m 755 rom $(INSTALL_PREFIX)/sbin/
   	install -d -m 755 $(INSTALL_PREFIX)$(MAN1)
   	install -m 755 rom.1 $(INSTALL_PREFIX)$(MAN1)
   
 diff -ruN reply-o-matic.orig/files/patch-main.c reply-o-matic/files/patch-main.c
 --- reply-o-matic.orig/files/patch-main.c	Fri Sep  1 03:24:01 2006
 +++ reply-o-matic/files/patch-main.c	Wed Dec 31 17:00:00 1969
 @@ -1,20 +0,0 @@
 ---- main.c.orig	Thu May 13 18:44:13 2004
 -+++ main.c	Thu May 13 18:44:46 2004
 -@@ -929,7 +929,7 @@
 - 		case -1: 
 - 			 diedie(2);
 - 			 break;
 --		default:
 -+/*		default: */
 - 	}
 - 	if ( forwardto[0] != 0 ) {
 - 		pipe(dfd);
 -@@ -966,7 +966,7 @@
 - 			case -1: 
 - 				 diedie(2);
 - 				 break;
 --			default:
 -+/*			default: */
 - 		}
 - 	}
 - 
 
 --------------060903070801040303020502--
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Sep 4 18:54:20 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

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