Bug 176194 - [PATCH] graphics/tifmerge: Simplify Makefile, remove dependency
Summary: [PATCH] graphics/tifmerge: Simplify Makefile, remove dependency
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alex Kozlov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-16 16:10 UTC by Christoph Mallon
Modified: 2013-02-19 09:25 UTC (History)
0 users

See Also:


Attachments
0001-graphics-tifmerge-Use-USE_DOS2UNIX-instead-of-conver.patch (1.15 KB, patch)
2013-02-16 16:10 UTC, Christoph Mallon
no flags Details | Diff
0002-graphics-tifmerge-Use-NO_WRKSUBDIR.patch (1.10 KB, patch)
2013-02-16 16:10 UTC, Christoph Mallon
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Mallon 2013-02-16 16:10:00 UTC
- Use USE_DOS2UNIX instead of converters/tuc.
- Use NO_WRKSUBDIR.

Fix: Please apply these patches.

	

dummy file, because GNATS damages every other patch
--- dummy1 ends here ---
Comment 1 dfilter service freebsd_committer freebsd_triage 2013-02-19 09:13:15 UTC
Author: ak
Date: Tue Feb 19 09:13:07 2013
New Revision: 312548
URL: http://svnweb.freebsd.org/changeset/ports/312548

Log:
  - Use USE_DOS2UNIX [1]
  - Use NO_WRKSUBDIR [1]
  - Switch to PLIST_FILES
  - General Makefile improvements
  
  PR:	ports/176194 [1]
  Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

Deleted:
  head/graphics/tifmerge/pkg-plist
Modified:
  head/graphics/tifmerge/Makefile   (contents, props changed)
  head/graphics/tifmerge/files/Makefile   (contents, props changed)

Modified: head/graphics/tifmerge/Makefile
==============================================================================
--- head/graphics/tifmerge/Makefile	Tue Feb 19 09:09:39 2013	(r312547)
+++ head/graphics/tifmerge/Makefile	Tue Feb 19 09:13:07 2013	(r312548)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	tifmerge
-# Date created:		29 April 1999
-# Whom:			G. Adam Stanislav <adam@whizkidtech.net>
-#
+# Created by: G. Adam Stanislav <adam@whizkidtech.net>
 # $FreeBSD$
-#
 
 PORTNAME=	tifmerge
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 DISTNAME=	tiff
@@ -14,26 +11,31 @@ 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
+NO_WRKSUBDIR=	yes
 DIST_SUBDIR=	tifmerge
+
+PLIST_FILES=	lib/libtifmerge.a \
+				include/tifmerge.h \
+				lib/libtifmerge.so \
+				lib/libtifmerge.so.1
+
 MAN3=		tifmerge.3
 
 post-extract:
-	@${MKDIR} ${WRKSRC}
-	@tuc ${WRKDIR}/TIFMERGE.H ${WRKSRC}/tifmerge.h
-	@tuc ${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
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libtifmerge.so.1 ${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libtifmerge.so.1 ${PREFIX}/lib
 	${LN} -fs ${PREFIX}/lib/libtifmerge.so.1 ${PREFIX}/lib/libtifmerge.so
 	${INSTALL_DATA} ${WRKSRC}/libtifmerge.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/tifmerge.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/tifmerge.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/tifmerge.3 ${MAN3PREFIX}/man/man3
 
 .include <bsd.port.mk>

Modified: head/graphics/tifmerge/files/Makefile
==============================================================================
--- head/graphics/tifmerge/files/Makefile	Tue Feb 19 09:09:39 2013	(r312547)
+++ head/graphics/tifmerge/files/Makefile	Tue Feb 19 09:13:07 2013	(r312548)
@@ -2,7 +2,7 @@ LIB=	tifmerge
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
-NOPROFILE=	yes
+NO_PROFILE=	yes
 
 SRCS=	tifmerge.c
 
_______________________________________________
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"
Comment 2 Alex Kozlov freebsd_committer freebsd_triage 2013-02-19 09:25:01 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 3 Alex Kozlov freebsd_committer freebsd_triage 2013-02-19 09:25:11 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!