ports/54016: oooqs port contains some typos and incorrect lines and break to build

[Rashid N. Achilov]

>Number:         54016
>Category:       ports
>Synopsis:       oooqs port contains some typos and incorrect lines and break to build
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 02 06:20:02 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Rashid N. Achilov
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Granch Ltd.
>Environment:
System: FreeBSD sentry.granch.ru 4.8-STABLE FreeBSD 4.8-STABLE #31: Tue Jul 1 14:08:16 NOVST 2003 shelton at sentry.granch.ru:/usr/src/sys/compile/Sentry i386
>Description:

oooqs (OpenOffice.org quickstarter) contains some typos and incorrect lines, which
leads port to break building. Here are three patches - to Makefile.in in oooqs, to
Makefile.in in docs/de and to makefile.in in docs/en
>How-To-Repeat:

Try to install fresh oooqs port
>Fix:
--- /tmp/oooqs-1.0_rc3/oooqs/Makefile.in	Wed Oct  9 15:26:24 2002
+++ /usr/ports/x11/oooqs/work/oooqs-1.0_rc3/oooqs/Makefile.in	Wed Jul  2 19:48:46 2003
@@ -724,13 +724,12 @@
 	-rm -f  oooqs_meta_unload.cpp

 #>+ 11
-oooqs.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/prefsdialog.cpp $(srcdir)/opendialog.cpp $(srcdir)/oooqs.cpp $(srcdir)/main.cpp oooqs_meta_unload.cpp oooqs.moc.cppopendialog.moc.cppprefsdialog.moc.cpp
+oooqs.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/prefsdialog.cpp $(srcdir)/opendialog.cpp $(srcdir)/oooqs.cpp $(srcdir)/main.cpp oooqs_meta_unload.cpp oooqs.moc.cpp opendialog.moc.cpp prefsdialog.moc.cpp
 	@echo 'creating oooqs.all_cpp.cpp ...'; \
 	rm -f oooqs.all_cpp.files oooqs.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> oooqs.all_cpp.final; \
-	for file in prefsdialog.cpp opendialog.cpp oooqs.cpp main.cpp oooqs_meta_unload.cpp oooqs.moc.cppopendialog.moc.cppprefsdialog.moc.cpp; do \
+	for file in prefsdialog.cpp opendialog.cpp oooqs.cpp main.cpp oooqs_meta_unload.cpp oooqs.moc.cpp opendialog.moc.cpp prefsdialog.moc.cpp; do \
 	  echo "#include \"$$file\"" >> oooqs.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> oooqs.all_cpp.final; \
 	done; \
 	cat oooqs.all_cpp.final oooqs.all_cpp.files > oooqs.all_cpp.cpp; \
 	rm -f oooqs.all_cpp.final oooqs.all_cpp.files

--- /tmp/oooqs-1.0_rc3/doc/en/Makefile.in	Wed Oct  9 15:26:24 2002
+++ /usr/ports/x11/oooqs/work/oooqs-1.0_rc3/doc/en/Makefile.in	Wed Jul  2 19:48:24 2003
@@ -409,7 +409,7 @@


 #>+ 21
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook index.cache.bz2
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi

 docs-am: index.cache.bz2

--- /tmp/oooqs-1.0_rc3/doc/de/Makefile.in	Wed Oct  9 15:26:23 2002
+++ /usr/ports/x11/oooqs/work/oooqs-1.0_rc3/doc/de/Makefile.in	Wed Jul  2 19:58:03 2003
@@ -409,7 +409,7 @@


 #>+ 21
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook index.cache.bz2
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi

 docs-am: index.cache.bz2

>Release-Note:
>Audit-Trail:
>Unformatted: