Bug 54016

Summary: oooqs port contains some typos and incorrect lines and break to build
Product: Ports & Packages Reporter: Rashid N. Achilov <shelton>
Component: Individual Port(s)Assignee: Tilman Keskinoz <arved>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
file.diff none

Description Rashid N. Achilov 2003-07-02 14:20:02 UTC 
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

Fix: #>+ 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

#>+ 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



#>+ 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--ELVYmGK0269Jp22aVBwSaTJndUdKOHy5FsiFWglV59ZAymg3
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- /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
How-To-Repeat: 
Try to install fresh oooqs port
Comment 1 Tilman Keskinoz freebsd_committer freebsd_triage 2003-07-02 14:22:35 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->arved

My port.
Comment 2 Tilman Keskinoz freebsd_committer freebsd_triage 2003-07-07 19:43:19 UTC 
State Changed
From-To: open->feedback

There are indeed error messages in the documentation building stage. 
But make completes without error, so i don't see the need for adding  
patchfiles to the port. 

Are there any differences at run time between your version and the port?
Comment 3 Tilman Keskinoz freebsd_committer freebsd_triage 2003-07-22 15:31:15 UTC 
State Changed
From-To: feedback->closed

Feedback timeout. 

Perhaps this bug should be reported to the upstream author.