Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Add Analog web log tool #15016

Closed
wants to merge 13 commits into from

10 participants

@thaxter

Addition of this ever-useful weblog analysis tool to brew. Based roughly on the
FreeBSD port install commands, including the analog.cfg-dist, which should be
fine, since analog doesn't really depend on the config file, but brew-specific
style points would be welcome. All extra and supporting files under
share/analog. Of these, only the lang files are essential.

@thaxter thaxter Add analog, venerable web logfile analyzer.
Addition of this ever-useful weblog analysis tool to brew. Based roughly on the
FreeBSD port install commands, including the analog.cfg-dist, which should be
fine, since analog doesn't really depend on the config file, but brew-specific
style points would be welcome. All extra and supporting files under
share/analog. Of these, only the lang files are essential. This is not a full
GNU make, just a simple make, with an extra definition for the lang files
location, and manual copy of supporting files into place.

Suggestions welcome, I would prefer to use brew at this point (over that other
thing that installs parallel libraries willy-nilly) so let's get this committed.
80b8126
Library/Formula/analog.rb
((11 lines not shown))
+ depends_on 'jpeg'
+ depends_on 'libpng'
+
+ def install
+ system "make DEFS='-DLANGDIR=\\\"/usr/local/share/analog/lang/\\\"'"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/bin"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/share/analog/lang"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/share/man"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/share/man/man1"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/etc"
+ system "mkdir -p /usr/local/Cellar/analog/6.0/share/analog"
+ system "cp analog /usr/local/Cellar/analog/6.0/bin"
+ system "cp -R examples how-to images lang /usr/local/Cellar/analog/6.0/share/analog/"
+ system "cp analog.man /usr/local/Cellar/analog/6.0/share/man/man1/analog.1"
+ system "cp analog.cfg /usr/local/Cellar/analog/6.0/etc/analog.cfg-dist"
+ end
@jacknagel Collaborator

Can't assume /usr/local, and you don't have to hardcode paths into the cellar, there are methods for this. Take a look at https://github.com/mxcl/homebrew/wiki/Formula-Cookbook

@thaxter
thaxter added a note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
yrammos and others added some commits
@yrammos yrammos lilypond: add option to build docs
Closes #14946.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
e00ecd7
@jwheare jwheare ircd-hybrid: Bump up the nickname limit to something airier.
There's no config setting for this, so we need to compile it in to something generous and useful

Closes #15005.

Signed-off-by: Max Howell <mxcl@me.com>
dd721cc
@2bits 2bits net-snmp: fix compile on ML, add darwin12.h
net-snmp has some fixes in HEAD for us coming in 5.7.2.
It fails on ML due to the same problem it has with Lion,
a missing header, and that's what's being fixed. It aslo
can't build the perl bindings because it wants to write to
`/Library/Perl`

- Duplicate the Lion path for ML and create `darwin12.h`
- Add `--enable-ipv6`
- Add `--with-logfile=#{var}/log/snmpd.log` fixes `/var/log/snmpd.log`
- Add `--disable-embedded-perl`
- Add `--without-perl-modules`
- Add `--disable-debugging`
- Remove an unused function `header_created?`

Fixes #14990.
Closes #15009.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
4f0844d
@rmanalan rmanalan atlassian-plugin-sdk 4.0
Closes #15015.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
eb26b61
@adamv adamv tomcat 7.0.30 9b42f8b
@jacknagel jacknagel Update Xcode.latest_version for 4.5
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
719e902
@intepinte intepinte task 2.1.2
Closes #15012.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
27ce4be
@mblair mblair Jenkins 1.482
Closes #15017.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
1224008
@thaxter thaxter Updated to use variables instead of hard-coded paths, and to use sha1…
… vs md5.
83706a0
@thaxter thaxter Use variables for paths vs hard coded 4f2177e
@thaxter thaxter Revert "Use variables for paths vs hard coded"
This reverts commit 4f2177e054f297b35b31134db9da17b181758a5b.
3059b57
@thaxter thaxter Use built-in command for man page install
use man1.install and simplify 2 lines to 1
83a7571
@adamv
Owner

Please squash to a single commit for review; this will be easier if you make the pull request from a non-master branch.

@adamv
Owner

Also, this seems to hard-code the use of gcc.

@adamv
Owner

If you make pull requests from branches other than master, then you can git push -f after rebasing to update the pull request without getting merge and other commits.

@adamv
Owner

The use of the install method also applies to the things installed to share, too.

@samueljohn samueljohn commented on the diff
Library/Formula/analog.rb
@@ -0,0 +1,27 @@
+require 'formula'
+
+# Jason Thaxter <jason@thaxter.net>

I appreciate your work here, but usually we use git blame and git log to assign credit.

@thaxter
thaxter added a note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@adamv
Owner

This needs to be squashed to a single commit and rebased on master for review. Use a non-master branch for your pull request.

@adamv adamv closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 20, 2012
  1. @thaxter

    Add analog, venerable web logfile analyzer.

    thaxter authored
    Addition of this ever-useful weblog analysis tool to brew. Based roughly on the
    FreeBSD port install commands, including the analog.cfg-dist, which should be
    fine, since analog doesn't really depend on the config file, but brew-specific
    style points would be welcome. All extra and supporting files under
    share/analog. Of these, only the lang files are essential. This is not a full
    GNU make, just a simple make, with an extra definition for the lang files
    location, and manual copy of supporting files into place.
    
    Suggestions welcome, I would prefer to use brew at this point (over that other
    thing that installs parallel libraries willy-nilly) so let's get this committed.
  2. @yrammos @thaxter

    lilypond: add option to build docs

    yrammos authored thaxter committed
    Closes #14946.
    
    Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  3. @jwheare @thaxter

    ircd-hybrid: Bump up the nickname limit to something airier.

    jwheare authored thaxter committed
    There's no config setting for this, so we need to compile it in to something generous and useful
    
    Closes #15005.
    
    Signed-off-by: Max Howell <mxcl@me.com>
  4. @2bits @thaxter

    net-snmp: fix compile on ML, add darwin12.h

    2bits authored thaxter committed
    net-snmp has some fixes in HEAD for us coming in 5.7.2.
    It fails on ML due to the same problem it has with Lion,
    a missing header, and that's what's being fixed. It aslo
    can't build the perl bindings because it wants to write to
    `/Library/Perl`
    
    - Duplicate the Lion path for ML and create `darwin12.h`
    - Add `--enable-ipv6`
    - Add `--with-logfile=#{var}/log/snmpd.log` fixes `/var/log/snmpd.log`
    - Add `--disable-embedded-perl`
    - Add `--without-perl-modules`
    - Add `--disable-debugging`
    - Remove an unused function `header_created?`
    
    Fixes #14990.
    Closes #15009.
    
    Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  5. @rmanalan @thaxter

    atlassian-plugin-sdk 4.0

    rmanalan authored thaxter committed
    Closes #15015.
    
    Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  6. @adamv @thaxter

    tomcat 7.0.30

    adamv authored thaxter committed
  7. @jacknagel @thaxter

    Update Xcode.latest_version for 4.5

    jacknagel authored thaxter committed
    Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  8. @intepinte @thaxter

    task 2.1.2

    intepinte authored thaxter committed
    Closes #15012.
    
    Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  9. @mblair @thaxter

    Jenkins 1.482

    mblair authored thaxter committed
    Closes #15017.
    
    Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  10. @thaxter
  11. @thaxter
  12. @thaxter

    Revert "Use variables for paths vs hard coded"

    thaxter authored
    This reverts commit 4f2177e054f297b35b31134db9da17b181758a5b.
Commits on Sep 21, 2012
  1. @thaxter

    Use built-in command for man page install

    thaxter authored
    use man1.install and simplify 2 lines to 1
This page is out of date. Refresh to see the latest.
View
27 Library/Formula/analog.rb
@@ -0,0 +1,27 @@
+require 'formula'
+
+# Jason Thaxter <jason@thaxter.net>

I appreciate your work here, but usually we use git blame and git log to assign credit.

@thaxter
thaxter added a note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+
+class Analog < Formula
+ homepage 'http://analog.cx'
+ url 'http://analog.cx/analog-6.0.tar.gz'
+ sha1 '17ad601f84e73c940883fb9b9e805879aac37493'
+
+ depends_on 'gd'
+ depends_on 'jpeg'
+ depends_on 'libpng'
+
+ def install
+ system "make DEFS='-DLANGDIR=\\\"#{share}/analog/lang/\\\"'"
+ system "mkdir -p #{bin}"
+ system "cp analog #{bin}"
+ system "mkdir -p #{share}/analog"
+ system "cp -R examples how-to images lang #{share}/analog/"
+ system "cp analog.cfg #{share}/analog/analog.cfg-dist"
+ man1.install "analog.man" => "analog.1"
+ end
+
+ def test
+ system "#{bin}/analog > /dev/null"
+ end
+end
View
6 Library/Formula/atlassian-plugin-sdk.rb
@@ -2,8 +2,8 @@
class AtlassianPluginSdk < Formula
homepage 'https://developer.atlassian.com/display/DOCS/Atlassian+Plugin+SDK+Documentation'
- url 'https://maven.atlassian.com/content/repositories/atlassian-public/com/atlassian/amps/atlassian-plugin-sdk/3.11/atlassian-plugin-sdk-3.11.tar.gz'
- sha1 'c54a3498553653d2d5a29362a37fe86df2ea169a'
+ url 'https://maven.atlassian.com/content/repositories/atlassian-public/com/atlassian/amps/atlassian-plugin-sdk/4.0/atlassian-plugin-sdk-4.0.tar.gz'
+ sha1 'f18ee77fbad58ceca3108ccc271cabcefa23f817'
def install
# Remove windows files
@@ -22,7 +22,7 @@ def caveats
visit https://developer.atlassian.com.
To create a plugin skeleton using atlas-create-APPLICATION-plugin, e.g.:
- atlas-create-jira-plugin
+ atlas-create-jira-plugin or atlas-create-confluence-plugin
To run your plugin's host application with the plugin skeleton installed:
atlas-run
View
4 Library/Formula/ircd-hybrid.rb
@@ -14,7 +14,9 @@ def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
- "--localstatedir=#{var}"
+ "--localstatedir=#{var}",
+ # there's no config setting for this so set it to something generous
+ "--with-nicklen=30"
system "make install"
end
View
6 Library/Formula/jenkins.rb
@@ -2,9 +2,9 @@
class Jenkins < Formula
homepage 'http://jenkins-ci.org'
- url 'http://mirrors.jenkins-ci.org/war/1.478/jenkins.war'
- version '1.478'
- sha1 'e26a450b8e1cee543a9038b37a41b8d0e9b9b043'
+ url 'http://mirrors.jenkins-ci.org/war/1.482/jenkins.war'
+ version '1.482'
+ sha1 '88c1d372282fdc11f8eadff94a415acd5481ca69'
head 'https://github.com/jenkinsci/jenkins.git'
View
17 Library/Formula/lilypond.rb
@@ -26,6 +26,8 @@ class Lilypond < Formula
env :userpaths
+ option 'with-doc', "Build documentation in addition to binaries (may require several hours)."
+
depends_on TexInstalled.new
depends_on 'pkg-config' => :build
depends_on 'gettext'
@@ -37,6 +39,15 @@ class Lilypond < Formula
depends_on 'texinfo'
depends_on :x11
+ # Assert documentation dependencies if requested.
+ if build.include? 'with-doc'
+ depends_on 'netpbm'
+ depends_on 'imagemagick'
+ depends_on 'docbook'
+ depends_on 'dblatex' => :python
+ depends_on 'texi2html'
+ end
+
skip_clean :all
fails_with :clang do
@@ -52,6 +63,12 @@ def install
# Separate steps to ensure that lilypond's custom fonts are created.
system 'make all'
system "make install"
+
+ # Build documentation if requested.
+ if build.include? 'with-doc'
+ system "make doc"
+ system "make install-doc"
+ end
end
def test
View
172 Library/Formula/net-snmp.rb
@@ -7,26 +7,27 @@ class NetSnmp < Formula
def patches
# Fixes compile error on Lion, missing header darwin11.h
- # The patch is reported upstream and does not exist in HEAD as of 2012-03-30.
+ # Fixes compile error on Mt. Lion, missing header darwin12.h
+ # The patch is reported upstream and fixed in HEAD. Remove at 5.7.2.
# https://sourceforge.net/tracker/?func=detail&aid=3514049&group_id=12694&atid=312694
DATA
end
def install
- system "./configure", "--prefix=#{prefix}",
- "--with-persistent-directory=#{var}/db/net-snmp",
+ system "./configure", "--disable-debugging",
+ "--prefix=#{prefix}",
+ "--enable-ipv6",
"--with-defaults",
- "--without-rpm",
+ "--with-persistent-directory=#{var}/db/net-snmp",
+ "--with-logfile=#{var}/log/snmpd.log",
"--with-mib-modules=host ucd-snmp/diskio",
- "--without-kmem-usage"
+ "--without-rpm",
+ "--without-kmem-usage",
+ "--disable-embedded-perl",
+ "--without-perl-modules"
system "make"
system "make install"
end
-
- def header_created?
- cp 'include/net-snmp/system/darwin10.h', 'include/net-snmp/system/darwin11.h'
- return TRUE
- end
end
__END__
@@ -184,3 +185,154 @@ def header_created?
+#define UDP_ADDRESSES_IN_HOST_ORDER 1
+#endif
+
+--- /dev/null
++++ b/include/net-snmp/system/darwin12.h
+@@ -0,0 +1,148 @@
++/*
++ * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs
++ * substantially enough to not warrant pretending it is a BSD flavor.
++ * This first section are the vestigal BSD remnants.
++ */
++/* Portions of this file are subject to the following copyright(s). See
++ * the Net-SNMP's COPYING file for more details and other copyrights
++ * that may apply:
++ */
++/*
++ * Portions of this file are copyrighted by:
++ * Copyright (C) 2007 Apple, Inc. All rights reserved.
++ * Use is subject to license terms specified in the COPYING file
++ * distributed with the Net-SNMP package.
++ */
++
++/*
++ * BSD systems use a different method of looking up sockaddr_in values
++ */
++/* #define NEED_KLGETSA 1 */
++
++/*
++ * ARP_Scan_Next needs a 4th ifIndex argument
++ */
++#define ARP_SCAN_FOUR_ARGUMENTS 1
++
++#define CHECK_RT_FLAGS 1
++
++/*
++ * this is not good enough before freebsd3!
++ */
++/* #undef HAVE_NET_IF_MIB_H */
++
++/*
++ * This section adds the relevant definitions from generic.h
++ * (a file we don't include here)
++ */
++
++/*
++ * udp_inpcb list symbol, e.g. for mibII/udpTable.c
++ */
++#define INP_NEXT_SYMBOL inp_next
++
++/*
++ * This section defines Mac OS X 10.5 (and later) specific additions.
++ */
++#define darwin 12
++#ifndef darwin12
++# define darwin12 darwin
++#endif
++
++/*
++ * Mac OS X should only use the modern API and definitions.
++ */
++#ifndef NETSNMP_NO_LEGACY_DEFINITIONS
++#define NETSNMP_NO_LEGACY_DEFINITIONS 1
++#endif
++
++/*
++ * looks like the IFTable stuff works better than the mibII versions
++ */
++
++#define NETSNMP_INCLUDE_IFTABLE_REWRITES
++
++/*
++ * use new host resources files as well
++ */
++#define NETSNMP_INCLUDE_HRSWINST_REWRITES
++#define NETSNMP_INCLUDE_HRSWRUN_REWRITES
++#undef NETSNMP_INCLUDE_HRSWRUN_WRITE_SUPPORT
++#define NETSNMP_CAN_GET_DISK_LABEL 1
++
++/*
++ * Enabling this restricts the compiler to mostly public APIs.
++ */
++#ifndef __APPLE_API_STRICT_CONFORMANCE
++#define __APPLE_API_STRICT_CONFORMANCE 1
++#endif
++#ifndef __APPLE_API_UNSTABLE
++#define __APPLE_API_UNSTABLE 1
++#endif
++
++/*
++ * Darwin's tools are capable of building multiple architectures in one pass.
++ * As a result, platform definitions should be deferred until compile time.
++ */
++#ifdef BYTE_ORDER
++# undef WORDS_BIGENDIAN
++# if BYTE_ORDER == BIG_ENDIAN
++# define WORDS_BIGENDIAN 1
++# endif
++#endif
++
++/*
++ * Darwin's tools are capable of building multiple architectures in one pass.
++ * As a result, platform definitions should be deferred until compile time.
++ */
++#ifdef BYTE_ORDER
++# undef WORDS_BIGENDIAN
++# if BYTE_ORDER == BIG_ENDIAN
++# define WORDS_BIGENDIAN 1
++# endif
++#endif
++
++/*
++ * Although Darwin does have an fstab.h file, getfsfile etc. always return null.
++ * At least, as of 5.3.
++ */
++#undef HAVE_FSTAB_H
++
++#define SWAPFILE_DIR "/private/var/vm"
++#define SWAPFILE_PREFIX "swapfile"
++
++/*
++ * These apparently used to be in netinet/tcp_timers.h, but went away in
++ * 10.4.2. Define them here til we find out a way to get the real values.
++ */
++#define TCPTV_MIN ( 1*PR_SLOWHZ) /* minimum allowable value */
++#define TCPTV_REXMTMAX ( 64*PR_SLOWHZ) /* max allowable REXMT value */
++
++/*
++ * Because Mac OS X is built on Mach, it does not provide a BSD-compatible
++ * VM statistics API.
++ */
++#define USE_MACH_HOST_STATISTICS 1
++
++/*
++ * This tells code that manipulates IPv6 that the structures are unified,
++ * i.e., IPv4 and IPv6 use the same structs.
++ * This should eventually be replaced with a configure directive.
++ */
++/* #define USE_UNIFIED_IPV6_STRUCTS 1 */
++#undef STRUCT_in6pcb_HAS_inp_vflag
++
++/*
++ * utility macro used in several darwin specific files
++ */
++#define SNMP_CFRelease(x) do { if (x) { CFRelease(x); x = NULL; } } while(0)
++
++/*
++ * Mac OS X runs on both PPC and Intel hardware,
++ * which handle udpTable index values differently
++ */
++#include <TargetConditionals.h>
++#ifdef TARGET_RT_LITTLE_ENDIAN
++#define UDP_ADDRESSES_IN_HOST_ORDER 1
++#endif
++
View
10 Library/Formula/task.rb
@@ -2,17 +2,15 @@
class Task < Formula
homepage 'http://www.taskwarrior.org/'
- url 'http://www.taskwarrior.org/download/task-2.1.1.tar.gz'
- sha1 'c23cb320f3478e37527c5c3cc547286f97bacc7c'
+ url 'http://www.taskwarrior.org/download/task-2.1.2.tar.gz'
+ sha1 '4cd5a5cb562fa407f097e2cd7e7293183773cf5b'
depends_on "cmake" => :build
- skip_clean :all
-
def install
system "cmake", ".", *std_cmake_args
system "make install"
- (etc+'bash_completion.d').install 'scripts/bash/task.sh'
- (share+'zsh/site-functions').install 'scripts/zsh/_task'
+ (prefix/'etc/bash_completion.d').install 'scripts/bash/task.sh'
+ (share/'zsh/site-functions').install 'scripts/zsh/_task'
end
end
View
6 Library/Formula/tomcat.rb
@@ -2,10 +2,8 @@
class Tomcat < Formula
homepage 'http://tomcat.apache.org/'
- url 'http://www.apache.org/dyn/closer.cgi?path=tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.tar.gz'
- sha1 'f27061da957751d6feb58acb16ded680823203d4'
-
- skip_clean :all
+ url 'http://www.apache.org/dyn/closer.cgi?path=tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.tar.gz'
+ sha1 '2632d72b2e980f874ddc4f5b0f39a941f9937158'
def install
# Remove Windows scripts
View
2  Library/Homebrew/macos/xcode.rb
@@ -23,7 +23,7 @@ def latest_version
when 10.6 then "3.2.6"
else
if MacOS.version >= 10.7
- "4.4.1"
+ "4.5"
else
raise "Mac OS X `#{MacOS.version}' is invalid"
end
Something went wrong with that request. Please try again.