Undo erroneous "(Mac) OS X" to "macOS" changes

Partial revert of 1e62c645b2

Some patches and string replacements were mistakenly modified as part of
the mass substitution of "macOS" for "OS X" and "Mac OS X" references.

Closes #6088.

Signed-off-by: ilovezfs <ilovezfs@icloud.com>
This commit is contained in:
ilovezfs 2016-10-19 00:57:48 -07:00
parent e6983fd7e1
commit b60e1801b9
9 changed files with 9 additions and 9 deletions

View file

@ -45,7 +45,7 @@ class Exim < Formula
inreplace "OS/Makefile-Darwin" do |s|
s.remove_make_var! %w[CC CFLAGS]
# Add include and lib paths for BDB 4
s.gsub! "# Exim: OS-specific make file for Darwin (macOS).", "INCLUDE=-I#{bdb4.include}"
s.gsub! "# Exim: OS-specific make file for Darwin (Mac OS X).", "INCLUDE=-I#{bdb4.include}"
s.gsub! "DBMLIB =", "DBMLIB=#{bdb4.lib}/libdb-4.dylib"
end

View file

@ -39,7 +39,7 @@ index 2b26d6d..4001db1 100644
# Checks for libraries. (not perfect yet)
AC_SEARCH_LIBS([pthread_self], [pthread])
-AC_SEARCH_LIBS([alGetError], [openal32 openal])
+# Use macOS frameworks
+# Use Mac OS X frameworks
+LIBS="$LIBS -framework IOKit -framework OpenAL"
################################################################################

View file

@ -102,7 +102,7 @@ index ae2d7d8..4f4daed 100644
@@ -64,12 +64,12 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(G
# macOS
# MacOS X
-#GS_SOEXT=dylib
-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)

View file

@ -55,7 +55,7 @@ __END__
#define IFVERB if(options.opt & MPG321_VERBOSE_PLAY)
+/* The following defines are needed to emulate the Linux interface on
+ * BSD-based systems like FreeBSD and macOS */
+ * BSD-based systems like FreeBSD and OS X */
+#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP)
+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP

View file

@ -80,7 +80,7 @@ index e171047..b010c35 100644
-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-
# install the libraries (Linux and macOS command line)
# install the libraries (Linux and Mac OS X command line)
if(UNIX)
- INSTALL(TARGETS portmidi-static pmjni
+ INSTALL(TARGETS portmidi-static

View file

@ -310,7 +310,7 @@ __END__
--- a/src/pl/plpython/Makefile 2011-09-23 08:03:52.000000000 +1000
+++ b/src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100
@@ -24,8 +24,6 @@
# Darwin (macOS) has its own ideas about how to do this.
# Darwin (OS X) has its own ideas about how to do this.
ifeq ($(PORTNAME), darwin)
shared_libpython = yes
-override python_libspec = -framework Python

View file

@ -42,7 +42,7 @@ end
__END__
For some strange reason, wxWidgets does not take the required steps to register
programs as GUI apps like other toolkits do. This necessitates the creation of
an app bundle on macOS.
an app bundle on OS X.
This clever hack sidesteps the headache of packing simple programs into app
bundles:

View file

@ -74,7 +74,7 @@ diff -r 1522e2f6d700 -r 3bfc44d26963 Makefile.in
+ INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.6.0.dylib
+ INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.3.dylib
+
+# The macOS linker doesn't allow you to request static linkage when
+# The OS X linker doesn't allow you to request static linkage when
+# linking by library search path, if the same library name is found in
+# both static and dynamic versions. So if we install both static and
+# dynamic, the static library will never be used. That's OK for the

View file

@ -75,7 +75,7 @@ index b988be6..68d4a34 100755
locate_library /usr/lib/libpam.sl && echo "-lpam";
# AIX ends shared libraries with .a
locate_library /usr/lib/libpam.a && echo "-lpam";
+ # macOS / Darwin shared libraries with .dylib
+ # Mac OS X / Darwin shared libraries with .dylib
+ locate_library /usr/lib/libpam.dylib && echo "-lpam";
else
locate_library /lib/libcrypt.so && echo "-lcrypt";