Bug 187757
| Summary: | converters/ytnef: Fix build on -current | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | tkato432 | ||||||
| Component: | Individual Port(s) | Assignee: | Dmitry Marakasov <amdmi3> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | ||||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
tkato432
2014-03-19 18:40:06 UTC
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) Remake of the patch against current tree. Responsible Changed From-To: miwi->amdmi3 Take, since I've committed fixes to these Author: amdmi3 Date: Wed Apr 23 01:15:52 2014 New Revision: 351902 URL: http://svnweb.freebsd.org/changeset/ports/351902 QAT: https://qat.redports.org/buildarchive/r351902/ Log: - Minor port cleanup - Add LICENSE - Fix error handling PR: 187757 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Modified: head/converters/ytnef/Makefile head/converters/ytnef/files/patch-src__ytnef__main.c head/converters/ytnef/pkg-descr Modified: head/converters/ytnef/Makefile ============================================================================== --- head/converters/ytnef/Makefile Wed Apr 23 01:14:42 2014 (r351901) +++ head/converters/ytnef/Makefile Wed Apr 23 01:15:52 2014 (r351902) @@ -3,31 +3,34 @@ PORTNAME= ytnef PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters mail MASTER_SITES= SF 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} Modified: head/converters/ytnef/files/patch-src__ytnef__main.c ============================================================================== --- head/converters/ytnef/files/patch-src__ytnef__main.c Wed Apr 23 01:14:42 2014 (r351901) +++ head/converters/ytnef/files/patch-src__ytnef__main.c Wed Apr 23 01:15:52 2014 (r351902) @@ -9,3 +9,17 @@ 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) { Modified: head/converters/ytnef/pkg-descr ============================================================================== --- head/converters/ytnef/pkg-descr Wed Apr 23 01:14:42 2014 (r351901) +++ head/converters/ytnef/pkg-descr Wed Apr 23 01:15:52 2014 (r351902) @@ -1,15 +1,14 @@ -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/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed, with minor changes. Thanks! |
