Introduced a flexible, better packaging method.

12 files changed, 60 insertions, 132 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 1ea6a652c1ef..b86e55596455 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -150,20 +150,14 @@ do-build:
 .endif
 	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}'
 
-OOOFILES1=	openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw
-OOOFILES2=	openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw
-OOOFILES3=	openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw
-OOOFILES4=	openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw
-
 do-install:
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/${i} ${WRKDIR}/tmp
-.endfor
-.for i in ${OOOFILES1} ${OOOFILES2} ${OOOFILES3} ${OOOFILES4}
-	@cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/${i}
-.endfor
+	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xf ${WRKDIR}/tmp/$$i ; \
+	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}