Clean up the Makefile some by using .for and reducing wrapped lines.

3 files changed, 72 insertions, 84 deletions

diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 2b4c8371bd07..ce1ba8c2d394 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -104,7 +104,9 @@ do-extract:
 .endif
 
 post-configure:
-	@${PERL} -pi.orig -e 's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' ${WRKSRC}/setup.ins
+	@${PERL} -pi.orig -e \
+	    's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' \
+	    ${WRKSRC}/setup.ins
 
 do-install:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
@@ -118,10 +120,12 @@ do-install:
 	@${LN} -fs ${LINUXBASE}/${PREFIX}/${SOVERSION} ${PREFIX}/${SOVERSION}
 .endif
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
-	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${WRKDIR}/tmp/libXrender.so
+	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 \
+		${WRKDIR}/tmp/libXrender.so
 .endif
 	@${CAT} ${PKGMESSAGE}
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
+		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
 	@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
 		${ECHO} ; \
 		${ECHO} Ignore the error-message. StarOffice6.0 has been installed ; \
@@ -137,35 +141,26 @@ do-install:
 	@${MKDIR} -p ${PREFIX}/${SOVERSION}/share/config/registry/cache/instance/org/openoffice
 	@${MKDIR} ${OPENCONFIG}/Office
 	@${MKDIR} ${OPENCONFIG}/ucb
-	@${CP} ${WRKDIR}/Office/SFX.dat ${OPENCONFIG}/Office/SFX.dat
-	@${CP} ${WRKDIR}/Office/Labels.dat ${OPENCONFIG}/Office/Labels.dat
-	@${CP} ${WRKDIR}/Office/Impress.dat ${OPENCONFIG}/Office/Impress.dat
-	@${CP} ${WRKDIR}/Office/Draw.dat ${OPENCONFIG}/Office/Draw.dat
-	@${CP} ${WRKDIR}/Office/Java.dat ${OPENCONFIG}/Office/Java.dat
-	@${CP} ${WRKDIR}/Office/Chart.dat ${OPENCONFIG}/Office/Chart.dat
-	@${CP} ${WRKDIR}/Office/Calc.dat ${OPENCONFIG}/Office/Calc.dat
-	@${CP} ${WRKDIR}/Office/Linguistic.dat ${OPENCONFIG}/Office/Linguistic.dat
-	@${CP} ${WRKDIR}/Office/Writer.dat ${OPENCONFIG}/Office/Writer.dat
-	@${CP} ${WRKDIR}/Office/Common.dat ${OPENCONFIG}/Office/Common.dat
-	@${CP} ${WRKDIR}/Office/TypeDetection.dat ${OPENCONFIG}/Office/TypeDetection.dat
-	@${CP} ${WRKDIR}/Office/DataAccess.dat ${OPENCONFIG}/Office/DataAccess.dat
-	@${CP} ${WRKDIR}/Office/Math.dat ${OPENCONFIG}/Office/Math.dat
-	@${CP} ${WRKDIR}/Office/Views.dat ${OPENCONFIG}/Office/Views.dat
-	@${CP} ${WRKDIR}/Office/WriterWeb.dat ${OPENCONFIG}/Office/WriterWeb.dat
-	@${CP} ${WRKDIR}/ucb/Configuration.dat ${OPENCONFIG}/ucb/Configuration.dat
-	@${CP} ${WRKDIR}/ucb/Store.dat ${OPENCONFIG}/ucb/Store.dat
-	@${CP} ${WRKDIR}/ucb/Hierarchy.dat ${OPENCONFIG}/ucb/Hierarchy.dat
-	@${CP} ${WRKDIR}/Inet.dat ${OPENCONFIG}/Inet.dat
-	@${CP} ${WRKDIR}/UserProfile.dat ${OPENCONFIG}/UserProfile.dat
-	@${CP} ${WRKDIR}/Setup.dat ${OPENCONFIG}/Setup.dat
+.for f in Calc.dat Chart.dat Common.dat DataAccess.dat Draw.dat Impress.dat \
+    Java.dat Labels.dat Linguistic.dat Math.dat SFX.dat TypeDetection.dat \
+    Views.dat Writer.dat WriterWeb.dat
+	@${INSTALL_DATA} ${WRKDIR}/Office/${f} ${OPENCONFIG}/Office
+.endfor
+.for f in Configuration.dat Hierarchy.dat Store.dat
+	@${INSTALL_DATA} ${WRKDIR}/ucb/${f} ${OPENCONFIG}/ucb
+.endfor
+	@${INSTALL_DATA} ${WRKDIR}/Inet.dat ${OPENCONFIG}
+.for f in Setup.dat UserProfile.dat
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${OPENCONFIG}
+.endfor
 .endif
 
 post-install:
-	@${CP} ${INSTDB.INS} ${INSTDB.INS}.orig
+	@${MV} ${INSTDB.INS} ${INSTDB.INS}.orig
 	@${SED} -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
-	    < ${INSTDB.INS}.orig > ${INSTDB.INS}
-	@${CP} ${PREFIX}/${SOVERSION}/program/soffice ${PREFIX}/${SOVERSION}/program/spadmin
-	@${CHMOD} 755 ${PREFIX}/${SOVERSION}/program/spadmin
+	    ${INSTDB.INS}.orig > ${INSTDB.INS}
+	@${INSTALL_PROGRAM} ${PREFIX}/${SOVERSION}/program/soffice \
+		${PREFIX}/${SOVERSION}/program/spadmin
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
 	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${PREFIX}/${SOVERSION}/program/libXrender.so
 .endif
@@ -173,4 +168,5 @@ post-install:
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \
 		${PREFIX}/${SOVERSION}/program/setup
+
 .include <bsd.port.post.mk>
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 2b4c8371bd07..ce1ba8c2d394 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -104,7 +104,9 @@ do-extract:
 .endif
 
 post-configure:
-	@${PERL} -pi.orig -e 's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' ${WRKSRC}/setup.ins
+	@${PERL} -pi.orig -e \
+	    's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' \
+	    ${WRKSRC}/setup.ins
 
 do-install:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
@@ -118,10 +120,12 @@ do-install:
 	@${LN} -fs ${LINUXBASE}/${PREFIX}/${SOVERSION} ${PREFIX}/${SOVERSION}
 .endif
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
-	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${WRKDIR}/tmp/libXrender.so
+	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 \
+		${WRKDIR}/tmp/libXrender.so
 .endif
 	@${CAT} ${PKGMESSAGE}
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
+		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
 	@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
 		${ECHO} ; \
 		${ECHO} Ignore the error-message. StarOffice6.0 has been installed ; \
@@ -137,35 +141,26 @@ do-install:
 	@${MKDIR} -p ${PREFIX}/${SOVERSION}/share/config/registry/cache/instance/org/openoffice
 	@${MKDIR} ${OPENCONFIG}/Office
 	@${MKDIR} ${OPENCONFIG}/ucb
-	@${CP} ${WRKDIR}/Office/SFX.dat ${OPENCONFIG}/Office/SFX.dat
-	@${CP} ${WRKDIR}/Office/Labels.dat ${OPENCONFIG}/Office/Labels.dat
-	@${CP} ${WRKDIR}/Office/Impress.dat ${OPENCONFIG}/Office/Impress.dat
-	@${CP} ${WRKDIR}/Office/Draw.dat ${OPENCONFIG}/Office/Draw.dat
-	@${CP} ${WRKDIR}/Office/Java.dat ${OPENCONFIG}/Office/Java.dat
-	@${CP} ${WRKDIR}/Office/Chart.dat ${OPENCONFIG}/Office/Chart.dat
-	@${CP} ${WRKDIR}/Office/Calc.dat ${OPENCONFIG}/Office/Calc.dat
-	@${CP} ${WRKDIR}/Office/Linguistic.dat ${OPENCONFIG}/Office/Linguistic.dat
-	@${CP} ${WRKDIR}/Office/Writer.dat ${OPENCONFIG}/Office/Writer.dat
-	@${CP} ${WRKDIR}/Office/Common.dat ${OPENCONFIG}/Office/Common.dat
-	@${CP} ${WRKDIR}/Office/TypeDetection.dat ${OPENCONFIG}/Office/TypeDetection.dat
-	@${CP} ${WRKDIR}/Office/DataAccess.dat ${OPENCONFIG}/Office/DataAccess.dat
-	@${CP} ${WRKDIR}/Office/Math.dat ${OPENCONFIG}/Office/Math.dat
-	@${CP} ${WRKDIR}/Office/Views.dat ${OPENCONFIG}/Office/Views.dat
-	@${CP} ${WRKDIR}/Office/WriterWeb.dat ${OPENCONFIG}/Office/WriterWeb.dat
-	@${CP} ${WRKDIR}/ucb/Configuration.dat ${OPENCONFIG}/ucb/Configuration.dat
-	@${CP} ${WRKDIR}/ucb/Store.dat ${OPENCONFIG}/ucb/Store.dat
-	@${CP} ${WRKDIR}/ucb/Hierarchy.dat ${OPENCONFIG}/ucb/Hierarchy.dat
-	@${CP} ${WRKDIR}/Inet.dat ${OPENCONFIG}/Inet.dat
-	@${CP} ${WRKDIR}/UserProfile.dat ${OPENCONFIG}/UserProfile.dat
-	@${CP} ${WRKDIR}/Setup.dat ${OPENCONFIG}/Setup.dat
+.for f in Calc.dat Chart.dat Common.dat DataAccess.dat Draw.dat Impress.dat \
+    Java.dat Labels.dat Linguistic.dat Math.dat SFX.dat TypeDetection.dat \
+    Views.dat Writer.dat WriterWeb.dat
+	@${INSTALL_DATA} ${WRKDIR}/Office/${f} ${OPENCONFIG}/Office
+.endfor
+.for f in Configuration.dat Hierarchy.dat Store.dat
+	@${INSTALL_DATA} ${WRKDIR}/ucb/${f} ${OPENCONFIG}/ucb
+.endfor
+	@${INSTALL_DATA} ${WRKDIR}/Inet.dat ${OPENCONFIG}
+.for f in Setup.dat UserProfile.dat
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${OPENCONFIG}
+.endfor
 .endif
 
 post-install:
-	@${CP} ${INSTDB.INS} ${INSTDB.INS}.orig
+	@${MV} ${INSTDB.INS} ${INSTDB.INS}.orig
 	@${SED} -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
-	    < ${INSTDB.INS}.orig > ${INSTDB.INS}
-	@${CP} ${PREFIX}/${SOVERSION}/program/soffice ${PREFIX}/${SOVERSION}/program/spadmin
-	@${CHMOD} 755 ${PREFIX}/${SOVERSION}/program/spadmin
+	    ${INSTDB.INS}.orig > ${INSTDB.INS}
+	@${INSTALL_PROGRAM} ${PREFIX}/${SOVERSION}/program/soffice \
+		${PREFIX}/${SOVERSION}/program/spadmin
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
 	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${PREFIX}/${SOVERSION}/program/libXrender.so
 .endif
@@ -173,4 +168,5 @@ post-install:
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \
 		${PREFIX}/${SOVERSION}/program/setup
+
 .include <bsd.port.post.mk>
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 2b4c8371bd07..ce1ba8c2d394 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -104,7 +104,9 @@ do-extract:
 .endif
 
 post-configure:
-	@${PERL} -pi.orig -e 's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' ${WRKSRC}/setup.ins
+	@${PERL} -pi.orig -e \
+	    's|DefaultDestPath = "staroffice%PRODUCTVERSION";|DefaultDestPath = "${PREFIX}/staroffice%PRODUCTVERSION";|' \
+	    ${WRKSRC}/setup.ins
 
 do-install:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
@@ -118,10 +120,12 @@ do-install:
 	@${LN} -fs ${LINUXBASE}/${PREFIX}/${SOVERSION} ${PREFIX}/${SOVERSION}
 .endif
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
-	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${WRKDIR}/tmp/libXrender.so
+	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 \
+		${WRKDIR}/tmp/libXrender.so
 .endif
 	@${CAT} ${PKGMESSAGE}
-	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
+	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
+		TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup -net'
 	@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
 		${ECHO} ; \
 		${ECHO} Ignore the error-message. StarOffice6.0 has been installed ; \
@@ -137,35 +141,26 @@ do-install:
 	@${MKDIR} -p ${PREFIX}/${SOVERSION}/share/config/registry/cache/instance/org/openoffice
 	@${MKDIR} ${OPENCONFIG}/Office
 	@${MKDIR} ${OPENCONFIG}/ucb
-	@${CP} ${WRKDIR}/Office/SFX.dat ${OPENCONFIG}/Office/SFX.dat
-	@${CP} ${WRKDIR}/Office/Labels.dat ${OPENCONFIG}/Office/Labels.dat
-	@${CP} ${WRKDIR}/Office/Impress.dat ${OPENCONFIG}/Office/Impress.dat
-	@${CP} ${WRKDIR}/Office/Draw.dat ${OPENCONFIG}/Office/Draw.dat
-	@${CP} ${WRKDIR}/Office/Java.dat ${OPENCONFIG}/Office/Java.dat
-	@${CP} ${WRKDIR}/Office/Chart.dat ${OPENCONFIG}/Office/Chart.dat
-	@${CP} ${WRKDIR}/Office/Calc.dat ${OPENCONFIG}/Office/Calc.dat
-	@${CP} ${WRKDIR}/Office/Linguistic.dat ${OPENCONFIG}/Office/Linguistic.dat
-	@${CP} ${WRKDIR}/Office/Writer.dat ${OPENCONFIG}/Office/Writer.dat
-	@${CP} ${WRKDIR}/Office/Common.dat ${OPENCONFIG}/Office/Common.dat
-	@${CP} ${WRKDIR}/Office/TypeDetection.dat ${OPENCONFIG}/Office/TypeDetection.dat
-	@${CP} ${WRKDIR}/Office/DataAccess.dat ${OPENCONFIG}/Office/DataAccess.dat
-	@${CP} ${WRKDIR}/Office/Math.dat ${OPENCONFIG}/Office/Math.dat
-	@${CP} ${WRKDIR}/Office/Views.dat ${OPENCONFIG}/Office/Views.dat
-	@${CP} ${WRKDIR}/Office/WriterWeb.dat ${OPENCONFIG}/Office/WriterWeb.dat
-	@${CP} ${WRKDIR}/ucb/Configuration.dat ${OPENCONFIG}/ucb/Configuration.dat
-	@${CP} ${WRKDIR}/ucb/Store.dat ${OPENCONFIG}/ucb/Store.dat
-	@${CP} ${WRKDIR}/ucb/Hierarchy.dat ${OPENCONFIG}/ucb/Hierarchy.dat
-	@${CP} ${WRKDIR}/Inet.dat ${OPENCONFIG}/Inet.dat
-	@${CP} ${WRKDIR}/UserProfile.dat ${OPENCONFIG}/UserProfile.dat
-	@${CP} ${WRKDIR}/Setup.dat ${OPENCONFIG}/Setup.dat
+.for f in Calc.dat Chart.dat Common.dat DataAccess.dat Draw.dat Impress.dat \
+    Java.dat Labels.dat Linguistic.dat Math.dat SFX.dat TypeDetection.dat \
+    Views.dat Writer.dat WriterWeb.dat
+	@${INSTALL_DATA} ${WRKDIR}/Office/${f} ${OPENCONFIG}/Office
+.endfor
+.for f in Configuration.dat Hierarchy.dat Store.dat
+	@${INSTALL_DATA} ${WRKDIR}/ucb/${f} ${OPENCONFIG}/ucb
+.endfor
+	@${INSTALL_DATA} ${WRKDIR}/Inet.dat ${OPENCONFIG}
+.for f in Setup.dat UserProfile.dat
+	@${INSTALL_DATA} ${WRKDIR}/${f} ${OPENCONFIG}
+.endfor
 .endif
 
 post-install:
-	@${CP} ${INSTDB.INS} ${INSTDB.INS}.orig
+	@${MV} ${INSTDB.INS} ${INSTDB.INS}.orig
 	@${SED} -e 's%DefaultDestPath = "${PREFIX}/staroffice%DefaultDestPath = "staroffice%' \
-	    < ${INSTDB.INS}.orig > ${INSTDB.INS}
-	@${CP} ${PREFIX}/${SOVERSION}/program/soffice ${PREFIX}/${SOVERSION}/program/spadmin
-	@${CHMOD} 755 ${PREFIX}/${SOVERSION}/program/spadmin
+	    ${INSTDB.INS}.orig > ${INSTDB.INS}
+	@${INSTALL_PROGRAM} ${PREFIX}/${SOVERSION}/program/soffice \
+		${PREFIX}/${SOVERSION}/program/spadmin
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXrender.so)
 	@${LN} -fs ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1.0 ${PREFIX}/${SOVERSION}/program/libXrender.so
 .endif
@@ -173,4 +168,5 @@ post-install:
 install-user:
 	@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" ${LINUXBASE}/bin/sh -c \
 		${PREFIX}/${SOVERSION}/program/setup
+
 .include <bsd.port.post.mk>