cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b33862bd03
openbsd-ports/editors/openoffice3/patches/patch-epm_epm-3_7_patch
robert 2d0776a488 Import of OpenOffice 3.0; 
Currently it is a different port because it still needs a lot of work
and there are a lot of differences from openoffice2. It is not connected
to the build, and it's going to be merged with the openoffice2 port whenever
it's ready for use.
2008-10-30 18:51:05 +00:00

247 lines
6.8 KiB
Plaintext
Raw Blame History

--- epm/epm-3.7.patch.orig.port Sat Oct 27 12:05:58 2007
+++ epm/epm-3.7.patch Sat Oct 27 12:08:11 2007
@@ -1,5 +1,5 @@
*** misc/epm-3.7/bsd.c Tue Jan 14 18:05:01 2003
---- misc/build/epm-3.7/bsd.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/bsd.c Sat Oct 27 12:06:20 2007
***************
*** 26,31 ****
--- 26,38 ----
@@ -96,7 +96,7 @@
/*
* Remove temporary files...
*** misc/epm-3.7/configure Thu Jul 24 03:20:54 2003
---- misc/build/epm-3.7/configure Mon Nov 20 15:01:11 2006
+--- misc/build/epm-3.7/configure Sat Oct 27 12:07:58 2007
***************
*** 1238,1244 ****
--- 1238,1249 ----
@@ -202,8 +202,64 @@
else
CXXFLAGS="`$FLTKCONFIG --cflags` ${CXXFLAGS}"
GUIS="setup uninst"
+***************
+*** 5007,5059 ****
+
+ CXX="$CC"
+ OPTIM="-Wall -Wno-return-type $OPTIM"
+-
+- # See if GCC supports -fno-rtti...
+- echo "$as_me:$LINENO: checking if GCC supports -fno-rtti" >&5
+- echo $ECHO_N "checking if GCC supports -fno-rtti... $ECHO_C" >&6
+- OLDCFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -fno-rtti"
+- cat >conftest.$ac_ext <<_ACEOF
+- #line $LINENO "configure"
+- #include "confdefs.h"
+-
+- #ifdef F77_DUMMY_MAIN
+- # ifdef __cplusplus
+- extern "C"
+- # endif
+- int F77_DUMMY_MAIN() { return 1; }
+- #endif
+- int
+- main ()
+- {
+-
+- ;
+- return 0;
+- }
+- _ACEOF
+- rm -f conftest.$ac_objext
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- OPTIM="$OPTIM -fno-rtti"
+- echo "$as_me:$LINENO: result: yes" >&5
+- echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- echo "$as_me:$LINENO: result: no" >&5
+- echo "${ECHO_T}no" >&6
+- fi
+- rm -f conftest.$ac_objext conftest.$ac_ext
+- CFLAGS="$OLDCFLAGS"
+
+ # See if GCC supports -fno-exceptions...
+ echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5
+--- 5016,5021 ----
*** misc/epm-3.7/deb.c Wed Jan 15 15:29:24 2003
---- misc/build/epm-3.7/deb.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/deb.c Sat Oct 27 12:06:20 2007
***************
*** 26,31 ****
--- 26,53 ----
@@ -330,11 +386,12 @@
* Write the preinst file for DPKG...
*/
***************
-*** 417,422 ****
---- 454,480 ----
+*** 416,421 ****
+--- 453,479 ----
+ break;
}
}
-
++
+
+ /*
+ * Calculate and append Installed-Size to DEBIAN/control
@@ -355,12 +412,11 @@
+ add_size(fp, filename);
+ fclose(fp);
+
-+
+
/*
* Build the distribution from the spec file...
- */
*** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003
---- misc/build/epm-3.7/dist.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/dist.c Sat Oct 27 12:06:20 2007
***************
*** 394,401 ****
strcpy(platform->machine, "mips");
@@ -408,7 +464,7 @@
strcpy(platform->machine, "sparc");
#endif /* __sgi */
*** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003
---- misc/build/epm-3.7/epm.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/epm.c Sat Oct 27 12:06:20 2007
***************
*** 547,552 ****
--- 547,553 ----
@@ -420,7 +476,7 @@
puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
puts("see the GNU General Public License in the file COPYING or at");
*** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003
---- misc/build/epm-3.7/file.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/file.c Sat Oct 27 12:06:20 2007
***************
*** 108,114 ****
fclose(dstfile);
@@ -452,7 +508,7 @@
return (0);
--- 149,154 ----
*** misc/epm-3.7/osx.c Wed Jul 23 23:41:08 2003
---- misc/build/epm-3.7/osx.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/osx.c Sat Oct 27 12:06:20 2007
***************
*** 373,379 ****
else
@@ -471,7 +527,7 @@
"-p %s/%s.pkg -f %s/Package -r %s/Resources -d %s/%s-desc.plist -i %s/%s-info.plist",
filename, prodname, filename, filename, filename, prodname, filename, prodname);
*** misc/epm-3.7/pkg.c Tue Dec 17 19:57:56 2002
---- misc/build/epm-3.7/pkg.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/pkg.c Sat Oct 27 12:06:20 2007
***************
*** 429,503 ****
@@ -550,8 +606,21 @@
}
--- 429,434 ----
+*** misc/epm-3.7/portable.c Wed Jul 23 23:41:08 2003
+--- misc/build/epm-3.7/portable.c Sat Oct 27 12:06:20 2007
+***************
+*** 1515,1520 ****
+--- 1515,1522 ----
+ fputs("# Determine correct extract options for the tar command...\n", fp);
+ fputs("if test `uname` = Darwin; then\n", fp);
+ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
++ fputs("else if test `uname` = OpenBSD; then\n", fp);
++ fputs(" ac_tar=\"tar -xpPf\"\n", fp);
+ fputs("else if test \"`tar --help 2>&1 | grep GNU`\" = \"\"; then\n", fp);
+ fputs(" ac_tar=\"tar -xpf\"\n", fp);
+ fputs("else\n", fp);
*** misc/epm-3.7/qprintf.c Mon Jan 27 22:48:03 2003
---- misc/build/epm-3.7/qprintf.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/qprintf.c Sat Oct 27 12:06:20 2007
***************
*** 181,192 ****
@@ -587,7 +656,7 @@
}
*** misc/epm-3.7/rpm.c Wed Oct 1 21:27:15 2003
---- misc/build/epm-3.7/rpm.c Mon Nov 20 14:54:51 2006
+--- misc/build/epm-3.7/rpm.c Sat Oct 27 12:06:20 2007
***************
*** 38,44 ****
dist_t *dist, /* I - Distribution information */
@@ -679,7 +748,7 @@
fputs(" echo Setting up init scripts...\n", fp);
***************
-*** 259,265 ****
+*** 259,271 ****
fputs("fi\n", fp);
}
@@ -687,7 +756,13 @@
for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
if (tolower(file->type) == 'i')
break;
---- 281,290 ----
+
+ if (i)
+ {
+ fputs("if test \"x$1\" = x0; then\n", fp);
+ fputs(" echo Cleaning up init scripts...\n", fp);
+
+--- 281,297 ----
fputs("fi\n", fp);
}
@@ -698,9 +773,6 @@
for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
if (tolower(file->type) == 'i')
break;
-***************
-*** 266,271 ****
---- 291,297 ----
if (i)
{
@@ -754,10 +826,12 @@
fputs("%files\n", fp);
for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
***************
-*** 415,467 ****
+*** 413,465 ****
+ make_link(filename, file->src);
+ break;
}
- }
-
+- }
+-
- /*
- * Build the distribution from the spec file...
- */
@@ -803,9 +877,7 @@
- run_command(NULL, "/bin/rm -rf %s/buildroot", directory);
-
- unlink(specname);
-- }
--
- return (0);
- }
+ }
---- 457,462 ----
+ return (0);
+--- 455,460 ----
Reference in New Issue View Git Blame Copy Permalink