Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Mar 2014 03:25:31 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/187757: converters/ytnef: Fix build on -current
Message-ID:  <20140320032531.70524b647b7b18d590be3888@yahoo.com>
Resent-Message-ID: <201403191840.s2JIe6cX002586@freefall.freebsd.org>

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

>Number:         187757
>Category:       ports
>Synopsis:       converters/ytnef: Fix build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 19 18:40:06 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Add LICENSE

New file:
files/patch-src__ytnef__main.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/converters/ytnef/Makefile converters/ytnef/Makefile
--- /usr/ports/converters/ytnef/Makefile	2014-03-01 06:21:17.000000000 +0900
+++ converters/ytnef/Makefile	2014-03-20 00:00:00.000000000 +0900
@@ -10,24 +10,27 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unpack data in MS Outlook TNEF format
 
-OPTIONS_DEFINE=	DOCS
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	libytnef.so:${PORTSDIR}/devel/libytnef
 RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	src/ytnef/*.pl
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/ytnef bin/ytnefprocess.pl bin/ytnefprint
 PORTDOCS=	AUTHORS NEWS README
+PLIST_FILES=	bin/ytnef bin/ytnefprint bin/ytnefprocess.pl
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/src/ytnef/ytnefprocess.pl
+	@${REINPLACE_CMD} -e \
+		's|/usr/local/share|${PREFIX}/share|' ${WRKSRC}/src/ytnef/*.pl
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff -urN /usr/ports/converters/ytnef/files/patch-src__ytnef__main.c converters/ytnef/files/patch-src__ytnef__main.c
--- /usr/ports/converters/ytnef/files/patch-src__ytnef__main.c	1970-01-01 09:00:00.000000000 +0900
+++ converters/ytnef/files/patch-src__ytnef__main.c	2014-03-20 00:00:00.000000000 +0900
@@ -0,0 +1,25 @@
+--- src/ytnef/main.c.orig
++++ src/ytnef/main.c
+@@ -68,7 +68,7 @@
+                 case 'v': verbose++;
+                           break;
+                 case 'h': PrintHelp();
+-                          return;
++                          return 0;
+                 case 'f': savefiles = 1;
+                           filepath = argv[i+1];
+                           i++;
+@@ -103,11 +103,12 @@
+         TNEF.Debug = verbose;
+         if (TNEFParseFile(argv[i], &TNEF) == -1) {
+             printf("ERROR processing file\n");
+-            continue;
++            return 1;
+         }
+         ProcessTNEF(TNEF);
+         TNEFFree(&TNEF);
+     }
++    return 0;
+ }
+ 
+ void ProcessTNEF(TNEFStruct TNEF) {
diff -urN /usr/ports/converters/ytnef/pkg-descr converters/ytnef/pkg-descr
--- /usr/ports/converters/ytnef/pkg-descr	2014-01-23 03:00:23.000000000 +0900
+++ converters/ytnef/pkg-descr	2014-03-20 00:00:00.000000000 +0900
@@ -1,15 +1,15 @@
-This program decodes those annoying application/ms-tnef MIME attachments that
-Microsoft mail servers helpfully use to encapsulate your already MIME encoded
-attachments.
+This program decodes those annoying application/ms-tnef MIME
+attachments that Microsoft mail servers helpfully use to encapsulate
+your already MIME encoded attachments.
 
-Due to the proliferation of Microsoft Outlook and Exchange mail servers,
-more and more mail is encapsulated into this format.
+Due to the proliferation of Microsoft Outlook and Exchange mail
+servers, more and more mail is encapsulated into this format.
 
-The YTNEF program allows one to unpack the attachments which were encapsulated
-into the YTNEF attachment.  Thus alleviating the need to use Microsoft Outlook
-to view them.
+The YTNEF program allows one to unpack the attachments which were
+encapsulated into the YTNEF attachment. Thus alleviating the need to
+use Microsoft Outlook to view them.
 
 Now supports winmail.dat Outlook files
 
 Author: Randall Hand <randall.hand@gmail.com> 	
-WWW:	http://ytnef.sourceforge.net/
+WWW: http://ytnef.sourceforge.net/
>Release-Note:
>Audit-Trail:
>Unformatted:



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