From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 19 09:13:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9425A2A8;
 Tue, 19 Feb 2013 09:13:08 +0000 (UTC) (envelope-from ak@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 63DA7A5E;
 Tue, 19 Feb 2013 09:13:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1J9D8FE039468;
 Tue, 19 Feb 2013 09:13:08 GMT (envelope-from ak@svn.freebsd.org)
Received: (from ak@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1J9D8OE039465;
 Tue, 19 Feb 2013 09:13:08 GMT (envelope-from ak@svn.freebsd.org)
Message-Id: <201302190913.r1J9D8OE039465@svn.freebsd.org>
From: Alex Kozlov <ak@FreeBSD.org>
Date: Tue, 19 Feb 2013 09:13:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312548 - in head/graphics/tifmerge: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Feb 2013 09:13:08 -0000

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