Date: Sat, 16 Feb 2013 17:02:40 +0100 From: Christoph Mallon <christoph.mallon@gmx.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176194: [PATCH] graphics/tiffmerge: Simplify Makefile, remove dependency Message-ID: <E1U6kDo-0005t1-70@rotluchs.lokal> Resent-Message-ID: <201302161610.r1GGA05n009651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176194
>Category: ports
>Synopsis: [PATCH] graphics/tiffmerge: Simplify Makefile, remove dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 16 16:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Christoph Mallon
>Release:
>Organization:
>Environment:
>Description:
- Use USE_DOS2UNIX instead of converters/tuc.
- Use NO_WRKSUBDIR.
>How-To-Repeat:
>Fix:
Please apply these patches.
--- 0001-graphics-tifmerge-Use-USE_DOS2UNIX-instead-of-conver.patch begins here ---
>From cddf0a6056129756f15993727ed0a7fd9e4ed52a Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 16 Feb 2013 16:02:47 +0100
Subject: [PATCH 1/2] graphics/tifmerge: Use USE_DOS2UNIX instead of
converters/tuc.
---
graphics/tifmerge/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index 1c24347..2546188 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -14,8 +14,7 @@ DISTNAME= tiff
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to merge TIFF files into multi-page TIFF files
-EXTRACT_DEPENDS= tuc:${PORTSDIR}/converters/tuc
-
+USE_DOS2UNIX= *.[ch]
USE_LDCONFIG= yes
USE_ZIP= yes
DIST_SUBDIR= tifmerge
@@ -23,8 +22,8 @@ MAN3= tifmerge.3
post-extract:
@${MKDIR} ${WRKSRC}
- @tuc ${WRKDIR}/TIFMERGE.H ${WRKSRC}/tifmerge.h
- @tuc ${WRKDIR}/TIFMERGE.C ${WRKSRC}/tifmerge.c
+ @${MV} ${WRKDIR}/TIFMERGE.H ${WRKSRC}/tifmerge.h
+ @${MV} ${WRKDIR}/TIFMERGE.C ${WRKSRC}/tifmerge.c
@${CP} ${FILESDIR}/Makefile ${WRKSRC}
@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/tifmerge.3 > \
${WRKSRC}/tifmerge.3
--
1.8.1.3
--- 0001-graphics-tifmerge-Use-USE_DOS2UNIX-instead-of-conver.patch ends here ---
--- dummy1 begins here ---
dummy file, because GNATS damages every other patch
--- dummy1 ends here ---
--- 0002-graphics-tifmerge-Use-NO_WRKSUBDIR.patch begins here ---
>From 24c6ee76acc7f81265a5d4db214bfe83221fe802 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 16 Feb 2013 16:06:39 +0100
Subject: [PATCH 2/2] graphics/tifmerge: Use NO_WRKSUBDIR.
---
graphics/tifmerge/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index 2546188..3c347cd 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -14,6 +14,7 @@ DISTNAME= tiff
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to merge TIFF files into multi-page TIFF files
+NO_WRKSUBDIR= yes
USE_DOS2UNIX= *.[ch]
USE_LDCONFIG= yes
USE_ZIP= yes
@@ -21,9 +22,8 @@ DIST_SUBDIR= tifmerge
MAN3= tifmerge.3
post-extract:
- @${MKDIR} ${WRKSRC}
- @${MV} ${WRKDIR}/TIFMERGE.H ${WRKSRC}/tifmerge.h
- @${MV} ${WRKDIR}/TIFMERGE.C ${WRKSRC}/tifmerge.c
+ @${MV} ${WRKSRC}/TIFMERGE.H ${WRKSRC}/tifmerge.h
+ @${MV} ${WRKSRC}/TIFMERGE.C ${WRKSRC}/tifmerge.c
@${CP} ${FILESDIR}/Makefile ${WRKSRC}
@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/tifmerge.3 > \
${WRKSRC}/tifmerge.3
--
1.8.1.3
--- 0002-graphics-tifmerge-Use-NO_WRKSUBDIR.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1U6kDo-0005t1-70>