You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2011/12/13 22:53:26 UTC
svn commit: r1213947 - in /incubator/ooo/trunk/main/solenv:
gbuild/platform/freebsd.mk gbuild/platform/os2.mk inc/unxfbsd.mk
Author: pfg
Date: Tue Dec 13 21:53:25 2011
New Revision: 1213947
URL: http://svn.apache.org/viewvc?rev=1213947&view=rev
Log:
Fix license on new platform gbuild files. Minor BSD port cleanup.
Modified:
incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk
incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1213947&r1=1213946&r2=1213947&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk Tue Dec 13 21:53:25 2011
@@ -1,27 +1,21 @@
#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
#
#*************************************************************************
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk?rev=1213947&r1=1213946&r2=1213947&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk Tue Dec 13 21:53:25 2011
@@ -1,27 +1,21 @@
#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
#
#*************************************************************************
Modified: incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk?rev=1213947&r1=1213946&r2=1213947&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unxfbsd.mk Tue Dec 13 21:53:25 2011
@@ -65,9 +65,9 @@ JAVA_RUNTIME=-ljava_g
.ENDIF
# name of C++ Compiler
-CXX*=g++
+CXX*=c++
# name of C Compiler
-CC*=gcc
+CC*=cc
.IF "$(SYSBASE)"!=""
CFLAGS_SYSBASE:=--sysroot=$(SYSBASE)
CXX+:=$(CFLAGS_SYSBASE)