Thu Nov 12 01:15:32 2009 UTC ()
When fixing Makefile filenames for case, skip attempting to fix filenames that
are already correct.

Stops the build from breaking with errors about the source and destination
being the same.


(dsainty)
diff -r1.5 -r1.6 pkgsrc/textproc/OdfConverter/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/textproc/OdfConverter/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/OdfConverter/Attic/Makefile 2009/09/02 08:47:15 1.5
+++ pkgsrc/textproc/OdfConverter/Attic/Makefile 2009/11/12 01:15:31 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2009/09/02 08:47:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2009/11/12 01:15:31 dsainty Exp $
2# 2#
3 3
4DISTNAME= OdfAddinForOffice-src-3.0 4DISTNAME= OdfAddinForOffice-src-3.0
5PKGNAME= OdfConverter-3.0 5PKGNAME= OdfConverter-3.0
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= converters textproc 7CATEGORIES= converters textproc
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=odf-converter/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=odf-converter/}
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://odf-converter.sourceforge.net/ 12HOMEPAGE= http://odf-converter.sourceforge.net/
13COMMENT= Converter between Microsoft Office 2007 and OpenOffice formats 13COMMENT= Converter between Microsoft Office 2007 and OpenOffice formats
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -36,27 +36,28 @@ INSTALLATION_DIRS= bin share/doc/OdfConv @@ -36,27 +36,28 @@ INSTALLATION_DIRS= bin share/doc/OdfConv
36# 36#
37# The Subversion repository has a number of file name case issues. The 37# The Subversion repository has a number of file name case issues. The
38# essential ones are fixed here so that the build can complete on a 38# essential ones are fixed here so that the build can complete on a
39# case-sensitive filesystem. 39# case-sensitive filesystem.
40# 40#
41FILE_CASE_FIXES= ${BUILD_DIRS} 41FILE_CASE_FIXES= ${BUILD_DIRS}
42FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfCommandLineException.cs 42FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfCommandLineException.cs
43FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfConverter.cs 43FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfConverter.cs
44FILE_CASE_FIXES+= source/Shell/OdfConverter/OoxValidator.cs 44FILE_CASE_FIXES+= source/Shell/OdfConverter/OoxValidator.cs
45FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfValidator.cs 45FILE_CASE_FIXES+= source/Shell/OdfConverter/OdfValidator.cs
46post-extract: 46post-extract:
47 cd ${WRKDIR} && mv "odf-converter-r5224/trunk" ${DISTNAME:Q} 47 cd ${WRKDIR} && mv "odf-converter-r5224/trunk" ${DISTNAME:Q}
48 set -e; \ 48 set -e; \
49 find "${WRKSRC}" -name '[Mm][Aa][Kk][Ee][Ff][Ii][Ll][Ee]' -print | \ 49 find "${WRKSRC}" -name Makefile -o \
 50 -name '[Mm][Aa][Kk][Ee][Ff][Ii][Ll][Ee]' -print | \
50 while read file; do \ 51 while read file; do \
51 dir=`dirname "$$file"`; mv "$$file" "$$dir/Makefile"; done 52 dir=`dirname "$$file"`; mv "$$file" "$$dir/Makefile"; done
52 set -e; files=""; \ 53 set -e; files=""; \
53 for file in ${FILE_CASE_FIXES}; do \ 54 for file in ${FILE_CASE_FIXES}; do \
54 while [ -n "$$file" -a "$$file" != "." ]; do \ 55 while [ -n "$$file" -a "$$file" != "." ]; do \
55 files="$$file $$files"; base=`basename "$$file"`; \ 56 files="$$file $$files"; base=`basename "$$file"`; \
56 file=`dirname "$$file"`; \ 57 file=`dirname "$$file"`; \
57 done; \ 58 done; \
58 done; \ 59 done; \
59 for file in $$files; do \ 60 for file in $$files; do \
60 base=`basename "$$file"`; subdir=`dirname "$$file"`; \ 61 base=`basename "$$file"`; subdir=`dirname "$$file"`; \
61 lcbase=`basename "$$file" | tr 'A-Z' 'a-z'`; \ 62 lcbase=`basename "$$file" | tr 'A-Z' 'a-z'`; \
62 subdir="${WRKSRC}/$$subdir"; \ 63 subdir="${WRKSRC}/$$subdir"; \