SF.net SVN: gar:[24761] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Mar 23 17:01:53 CET 2015
Revision: 24761
http://sourceforge.net/p/gar/code/24761
Author: dmichelsen
Date: 2015-03-23 16:01:52 +0000 (Mon, 23 Mar 2015)
Log Message:
-----------
mod_markdown/trunk: Initial commit
Added Paths:
-----------
csw/mgar/pkg/mod_markdown/
csw/mgar/pkg/mod_markdown/Makefile
csw/mgar/pkg/mod_markdown/branches/
csw/mgar/pkg/mod_markdown/tags/
csw/mgar/pkg/mod_markdown/trunk/
csw/mgar/pkg/mod_markdown/trunk/Makefile
csw/mgar/pkg/mod_markdown/trunk/checksums
csw/mgar/pkg/mod_markdown/trunk/files/
csw/mgar/pkg/mod_markdown/trunk/files/0001-Do-not-unconditionally-use-Wall.patch
csw/mgar/pkg/mod_markdown/trunk/files/0002-Honour-DESTDIR.patch
csw/mgar/pkg/mod_markdown/trunk/files/COPYING
csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.postinstall
csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.preremove
Added: csw/mgar/pkg/mod_markdown/Makefile
===================================================================
--- csw/mgar/pkg/mod_markdown/Makefile (rev 0)
+++ csw/mgar/pkg/mod_markdown/Makefile 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Index: csw/mgar/pkg/mod_markdown/trunk
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk 2015-03-23 15:11:24 UTC (rev 24760)
+++ csw/mgar/pkg/mod_markdown/trunk 2015-03-23 16:01:52 UTC (rev 24761)
Property changes on: csw/mgar/pkg/mod_markdown/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/mod_markdown/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/Makefile 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,46 @@
+NAME = apache-mod-markdown
+VERSION = 1.0.2
+GARTYPE = v2
+
+DESCRIPTION = Apache markdown rendering module
+
+MASTER_SITES = https://github.com/hamano/apache-mod-markdown/releases/download/$(VERSION)/
+DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += CSWap2-mod-markdown.postinstall CSWap2-mod-markdown.preremove
+
+# Use patch until this is fixed:
+# https://github.com/hamano/apache-mod-markdown/pull/6
+PATCHFILES += 0001-Do-not-unconditionally-use-Wall.patch
+
+# Use patch until this is fixed:
+# https://github.com/hamano/apache-mod-markdown/pull/7
+PATCHFILES += 0002-Honour-DESTDIR.patch
+
+VENDOR_URL = https://github.com/hamano/apache-mod-markdown
+
+BUILD_DEP_PKGS += CSWlibmarkdown-dev
+
+PACKAGES = CSWap2-mod-markdown
+SPKG_DESC_CSWap2-mod-markdown = Apache markdown rendering module
+RUNTIME_DEP_PKGS_CSWap2-mod-markdown += CSWapache2
+RUNTIME_DEP_PKGS_CSWap2-mod-markdown += CSWlibmarkdown2
+CHECKPKG_OVERRIDES_CSWap2-mod-markdown += soname-not-part-of-filename|soname=libmodmarkdown.so.0|filename=mod_markdown.so
+
+# Apache paths
+AP2_ROOT = $(prefix)/apache2
+AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_EXTRACONF = $(DESTDIR)$(AP2_ROOT)/etc/extra
+AP2_SBIN = $(AP2_ROOT)/sbin
+APXS = $(AP2_SBIN)/apxs
+
+# Unconditional use of -Wall
+# GARCOMPILER = GNU
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-apxs=$(APXS)
+CONFIGURE_ARGS += --with-discount=$(prefix)
+
+# We need ginstall as install
+INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+include gar/category.mk
Property changes on: csw/mgar/pkg/mod_markdown/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/mod_markdown/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/checksums (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/checksums 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1 @@
+576391320665701a0fa32fb13c1745ff apache-mod-markdown-1.0.2.tar.bz2
Added: csw/mgar/pkg/mod_markdown/trunk/files/0001-Do-not-unconditionally-use-Wall.patch
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/files/0001-Do-not-unconditionally-use-Wall.patch (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/files/0001-Do-not-unconditionally-use-Wall.patch 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,25 @@
+From 650d6da99a11725585313542523e06fb1af12c2c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 23 Mar 2015 16:30:41 +0100
+Subject: [PATCH] Do not unconditionally use -Wall
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d8f9526..66be288 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -334,7 +334,7 @@ lib_LTLIBRARIES = libmodmarkdown.la
+ apache_CFLAGS = `@apxs@ -q CFLAGS` -I`@apxs@ -q INCLUDEDIR`
+ apache_LIBEXECDIR = `@apxs@ -q LIBEXECDIR`
+ libmodmarkdown_la_SOURCES = mod_markdown.c
+-libmodmarkdown_la_CFLAGS = -Wall $(apache_CFLAGS) -I at discount_dir@/include
++libmodmarkdown_la_CFLAGS = $(apache_CFLAGS) -I at discount_dir@/include
+ libmodmarkdown_la_LDFLAGS = -L at discount_dir@/lib -lmarkdown
+ INCLUDES = -D_LARGEFILE64_SOURCE
+ all: config.h
+--
+2.3.3
+
Added: csw/mgar/pkg/mod_markdown/trunk/files/0002-Honour-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/files/0002-Honour-DESTDIR.patch (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/files/0002-Honour-DESTDIR.patch 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,25 @@
+From 678bc69db4ea655d9f9e12d1084232bc99325808 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 23 Mar 2015 16:48:26 +0100
+Subject: [PATCH] Honour DESTDIR
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 66be288..b55abd4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -828,7 +828,7 @@ uninstall-am: uninstall-libLTLIBRARIES
+ #DEFS =
+
+ install: .libs/libmodmarkdown.so
+- install $< $(apache_LIBEXECDIR)/mod_markdown.so
++ install -D $< $(DESTDIR)$(apache_LIBEXECDIR)/mod_markdown.so
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--
+2.3.3
+
Copied: csw/mgar/pkg/mod_markdown/trunk/files/COPYING (from rev 24362, csw/mgar/pkg/mod_auth_external/trunk/files/COPYING)
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/files/COPYING (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/files/COPYING 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,54 @@
+/* ====================================================================
+ * Copyright (c) 1997-2002 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission.
+ *
+ * 5. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ *
+ * CVS $Id$
+ */
+
Copied: csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.postinstall (from rev 24362, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.postinstall)
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.postinstall (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.postinstall 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Enable the markdown module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \
+ markdown mod_markdown.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_markdown is enabled in httpd.conf but the server was not restarted.
+ Please check your configuration and restart apache.
+
+END
+
+exit 0
Copied: csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.preremove (from rev 24362, csw/mgar/pkg/mod_auth_external/trunk/files/CSWap2-mod-auth-external.preremove)
===================================================================
--- csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.preremove (rev 0)
+++ csw/mgar/pkg/mod_markdown/trunk/files/CSWap2-mod-markdown.preremove 2015-03-23 16:01:52 UTC (rev 24761)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+# Disable the markdown module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+ $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n \
+ markdown mod_markdown.so
+
+cat <<END
+
+NOTICE: mod_markdown is disabled in httpd.conf but the server was not restarted.
+ Please check your configuration and restart apache.
+
+END
+
+exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list