From 12335518ab39608d58370c85ff9f5384ad2aa5f7 Mon Sep 17 00:00:00 2001 From: MCApollo <34170230+MCApollo@users.noreply.github.com> Date: Sat, 20 Apr 2019 20:49:46 -0500 Subject: Ported in the homebrew-marauder for a hacky update/import system. TODO: Maybe add a license & fix up messy code. --- homebrew/subversionat18/.beer | 112 ++++++++++++++++++++++++++ homebrew/subversionat18/_metadata/description | 1 + homebrew/subversionat18/_metadata/homepage | 1 + homebrew/subversionat18/_metadata/name | 1 + homebrew/subversionat18/_metadata/version | 1 + homebrew/subversionat18/download.sh | 1 + homebrew/subversionat18/patches.sh | 49 +++++++++++ 7 files changed, 166 insertions(+) create mode 100644 homebrew/subversionat18/.beer create mode 100644 homebrew/subversionat18/_metadata/description create mode 100644 homebrew/subversionat18/_metadata/homepage create mode 100644 homebrew/subversionat18/_metadata/name create mode 100644 homebrew/subversionat18/_metadata/version create mode 100755 homebrew/subversionat18/download.sh create mode 100755 homebrew/subversionat18/patches.sh (limited to 'homebrew/subversionat18') diff --git a/homebrew/subversionat18/.beer b/homebrew/subversionat18/.beer new file mode 100644 index 000000000..33795f620 --- /dev/null +++ b/homebrew/subversionat18/.beer @@ -0,0 +1,112 @@ +{ + "name": "SubversionAT18", + "description": "Version control system", + "url": "https://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.19.tar.bz2", + "mirror": "https://archive.apache.org/dist/subversion/subversion-1.8.19.tar.bz2", + "homepage": "https://subversion.apache.org/", + "depends": [ + { + "depend": "pkg-config", + "build-depend": true + }, + { + "depend": "scons", + "build-depend": false + }, + { + "depend": "apr", + "build-depend": false + }, + { + "depend": "apr-util", + "build-depend": false + }, + { + "depend": "openssl", + "build-depend": false + }, + { + "depend": "sqlite", + "build-depend": false + } + ], + "resource": [ + { + "name": "serf", + "url": "https://www.apache.org/dyn/closer.cgi?path=serf/serf-1.3.9.tar.bz2" + } + ], + "conflicts": [], + "patches": [ + { + "url": null, + "data": [ + "diff --git a/configure b/configure\n", + "index 445251b..6ff4332 100755\n", + "--- a/configure\n", + "+++ b/configure\n", + "@@ -25366,6 +25366,8 @@ fi\n", + " SWIG_CPPFLAGS=\"$CPPFLAGS\"\n", + "\n", + " SWIG_CPPFLAGS=`echo \"$SWIG_CPPFLAGS\" | $SED -e 's/-no-cpp-precomp //'`\n", + "+ SWIG_CPPFLAGS=`echo \"$SWIG_CPPFLAGS\" | $SED -e 's/-F\\/[^ ]* //'`\n", + "+ SWIG_CPPFLAGS=`echo \"$SWIG_CPPFLAGS\" | $SED -e 's/-isystem\\/[^ ]* //'`\n", + "\n", + "\n", + "\n", + "diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in\n", + "index a60430b..bd9b017 100644\n", + "--- a/subversion/bindings/swig/perl/native/Makefile.PL.in\n", + "+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in\n", + "@@ -76,10 +76,13 @@ my $apr_ldflags = '@SVN_APR_LIBS@'\n", + "\n", + " chomp $apr_shlib_path_var;\n", + "\n", + "+my $config_ccflags = $Config{ccflags};\n", + "+$config_ccflags =~ s/-arch\\s+\\S+//g;\n", + "+\n", + " my %config = (\n", + " ABSTRACT => 'Perl bindings for Subversion',\n", + " DEFINE => $cppflags,\n", + "- CCFLAGS => join(' ', $cflags, $Config{ccflags}),\n", + "+ CCFLAGS => join(' ', $cflags, $config_ccflags),\n", + " INC => join(' ', $includes, $cppflags,\n", + " \" -I$swig_srcdir/perl/libsvn_swig_perl\",\n", + " \" -I$svnlib_srcdir/include\",\n", + "\n", + "diff --git a/build/get-py-info.py b/build/get-py-info.py\n", + "index 29a6c0a..dd1a5a8 100644\n", + "--- a/build/get-py-info.py\n", + "+++ b/build/get-py-info.py\n", + "@@ -83,7 +83,7 @@ def link_options():\n", + " options = sysconfig.get_config_var('LDSHARED').split()\n", + " fwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')\n", + "\n", + "- if fwdir and fwdir != \"no-framework\":\n", + "+ if fwdir and fwdir != \"no-framework\" and sys.platform != 'darwin':\n", + "\n", + " # Setup the framework prefix\n", + " fwprefix = sysconfig.get_config_var('PYTHONFRAMEWORKPREFIX')\n" + ] + } + ], + "install": [ + "inreplace \"Makefile.in\",", + "\"@APXS@ -i -S LIBEXECDIR=\\\"$(APACHE_LIBEXECDIR)\\\"\",", + "\"@APXS@ -i -S LIBEXECDIR=\\\"#{libexec.to_s.sub(\"@\", \"\\\\@\")}\\\"\"", + "serf_prefix = libexec/\"serf\"", + "resource(\"serf\").stage do", + "inreplace \"SConstruct\", \"unique=1\", \"unique=0\"", + "args = %W[PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc}", + "CFLAGS=#{ENV.cflags} LINKFLAGS=#{ENV.ldflags}", + "OPENSSL=#{Formula[\"openssl\"].opt_prefix}]", + "if MacOS.version >= :sierra || !MacOS::CLT.installed?", + "args << \"APR=#{Formula[\"apr\"].opt_prefix}\"", + "args << \"APU=#{Formula[\"apr-util\"].opt_prefix}\"", + "end", + "system \"scons\", *args", + "system \"scons\", \"install\"" + ], + "version": "1.8.19", + "file": "subversion@1.8.rb" +} \ No newline at end of file diff --git a/homebrew/subversionat18/_metadata/description b/homebrew/subversionat18/_metadata/description new file mode 100644 index 000000000..3d5a71dce --- /dev/null +++ b/homebrew/subversionat18/_metadata/description @@ -0,0 +1 @@ +Version control system diff --git a/homebrew/subversionat18/_metadata/homepage b/homebrew/subversionat18/_metadata/homepage new file mode 100644 index 000000000..e85d156c8 --- /dev/null +++ b/homebrew/subversionat18/_metadata/homepage @@ -0,0 +1 @@ +https://subversion.apache.org/ diff --git a/homebrew/subversionat18/_metadata/name b/homebrew/subversionat18/_metadata/name new file mode 100644 index 000000000..2b5a45e64 --- /dev/null +++ b/homebrew/subversionat18/_metadata/name @@ -0,0 +1 @@ +SubversionAT18 diff --git a/homebrew/subversionat18/_metadata/version b/homebrew/subversionat18/_metadata/version new file mode 100644 index 000000000..c8f955aa6 --- /dev/null +++ b/homebrew/subversionat18/_metadata/version @@ -0,0 +1 @@ +1.8.19 diff --git a/homebrew/subversionat18/download.sh b/homebrew/subversionat18/download.sh new file mode 100755 index 000000000..fda4c849a --- /dev/null +++ b/homebrew/subversionat18/download.sh @@ -0,0 +1 @@ +wget https://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.8.19.tar.bz2 || wget https://archive.apache.org/dist/subversion/subversion-1.8.19.tar.bz2 \ No newline at end of file diff --git a/homebrew/subversionat18/patches.sh b/homebrew/subversionat18/patches.sh new file mode 100755 index 000000000..66a2434f2 --- /dev/null +++ b/homebrew/subversionat18/patches.sh @@ -0,0 +1,49 @@ +echo 'Creating brew-patch.diff' +cat << EOF >> brew-patch.diff +diff --git a/configure b/configure +index 445251b..6ff4332 100755 +--- a/configure ++++ b/configure +@@ -25366,6 +25366,8 @@ fi + SWIG_CPPFLAGS="$CPPFLAGS" + + SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'` ++ SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-F\/[^ ]* //'` ++ SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-isystem\/[^ ]* //'` + + + +diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in +index a60430b..bd9b017 100644 +--- a/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -76,10 +76,13 @@ my $apr_ldflags = '@SVN_APR_LIBS@' + + chomp $apr_shlib_path_var; + ++my $config_ccflags = $Config{ccflags}; ++$config_ccflags =~ s/-arch\s+\S+//g; ++ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => join(' ', $cflags, $Config{ccflags}), ++ CCFLAGS => join(' ', $cflags, $config_ccflags), + INC => join(' ', $includes, $cppflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", + +diff --git a/build/get-py-info.py b/build/get-py-info.py +index 29a6c0a..dd1a5a8 100644 +--- a/build/get-py-info.py ++++ b/build/get-py-info.py +@@ -83,7 +83,7 @@ def link_options(): + options = sysconfig.get_config_var('LDSHARED').split() + fwdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') + +- if fwdir and fwdir != "no-framework": ++ if fwdir and fwdir != "no-framework" and sys.platform != 'darwin': + + # Setup the framework prefix + fwprefix = sysconfig.get_config_var('PYTHONFRAMEWORKPREFIX') +EOF -- cgit v1.2.3