Revision: 24760
http://sourceforge.net/p/gar/code/24760
Author: dmichelsen
Date: 2015-03-23 15:11:24 +0000 (Mon, 23 Mar 2015)
Log Message:
-----------
discount/trunk: Initial commit
Added Paths:
-----------
csw/mgar/pkg/discount/
csw/mgar/pkg/discount/Makefile
csw/mgar/pkg/discount/branches/
csw/mgar/pkg/discount/tags/
csw/mgar/pkg/discount/trunk/
csw/mgar/pkg/discount/trunk/Makefile
csw/mgar/pkg/discount/trunk/checksums
csw/mgar/pkg/discount/trunk/files/
csw/mgar/pkg/discount/trunk/files/0001-Add-specific-include-for-alloca.patch
csw/mgar/pkg/discount/trunk/files/0002-We-don-t-have-ldconfig-and-the-line-forces-exitcode-.patch
Added: csw/mgar/pkg/discount/Makefile
===================================================================
--- csw/mgar/pkg/discount/Makefile (rev 0)
+++ csw/mgar/pkg/discount/Makefile 2015-03-23 15:11:24 UTC (rev 24760)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Index: csw/mgar/pkg/discount/trunk
===================================================================
--- csw/mgar/pkg/discount/trunk 2015-03-23 14:57:26 UTC (rev 24759)
+++ csw/mgar/pkg/discount/trunk 2015-03-23 15:11:24 UTC (rev 24760)
Property changes on: csw/mgar/pkg/discount/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/discount/trunk/Makefile
===================================================================
--- csw/mgar/pkg/discount/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/discount/trunk/Makefile 2015-03-23 15:11:24 UTC (rev
24760)
@@ -0,0 +1,73 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = discount
+VERSION = 2.1.8
+GARTYPE = v2
+
+DESCRIPTION = Markdown text to html language
+
+MASTER_SITES = http://www.pell.portland.or.us/%7Eorc/Code/discount/
+DISTFILES = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Add-specific-include-for-alloca.patch
+PATCHFILES += 0002-We-don-t-have-ldconfig-and-the-line-forces-exitcode-.patch
+
+PACKAGES += CSWlibmarkdown2
+SPKG_DESC_CSWlibmarkdown2 = Markdown text to html language, libmarkdown.so.2
+PKGFILES_CSWlibmarkdown2 += $(call pkgfiles_lib,libmarkdown.so.2)
+
+PACKAGES += CSWlibmarkdown-dev
+SPKG_DESC_CSWlibmarkdown-dev += Development files for libmarkdown.so.2
+PKGFILES_CSWlibmarkdown-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibmarkdown-dev += CSWlibmarkdown2
+
+PACKAGES += CSWmarkdown
+SPKG_DESC_CSWmarkdown = Discound, the markdown text to html converter
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWmarkdown += CSWlibmarkdown2
+
+BUILD64_LIBS_ONLY = 1
+
+# This is really funky, if we execute configure.sh with 'sh' /opt/csw/lib/64
gets magically changed to
+# /opt/csw/lib/sparcv9 and is not used during packaging.
+REINPLACEMENTS += lib64
+REINPLACE_MATCH_lib64 = /bin/sh
+REINPLACE_WITH_lib64 = /bin/bash
+REINPLACE_FILES_lib64 += configure.sh
+
+# We need ginstall as install
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+# This crappy configure.sh only handles a subest and bails out on extra
parameters
+NODIRPATHS += --exec_prefix
+NODIRPATHS += --bindir
+NODIRPATHS += --datadir
+NODIRPATHS += --sysconfdir
+NODIRPATHS += --sharedstatedir
+NODIRPATHS += --localstatedir
+NODIRPATHS += --infodir
+NODIRPATHS += --includedir
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-all-features
+CONFIGURE_ARGS += --shared
+CONFIGURE_ARGS += --with-urlencoded-anchor
+
+# -fPIC and -L. are taken from the original Makefile, as we unconditionally
override we need to readd them here
+BUILD_OVERRIDE_VARS += CFLAGS
+BUILD_OVERRIDE_VAR_CFLAGS = -fPIC $(CFLAGS)
+BUILD_OVERRIDE_VARS += LFLAGS
+BUILD_OVERRIDE_VAR_LFLAGS += -L. $(LDFLAGS)
+
+TEST_TARGET = test
+
+# We have one failing test, reported upstream, skip for now
+SKIPTEST ?= 1
+
+include gar/category.mk
+
+post-extract:
+ @# Make a symlink, otherwise we would need a completely new rule
+ ln -s configure.sh $(WORKSRC)/configure
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/discount/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/discount/trunk/checksums
===================================================================
--- csw/mgar/pkg/discount/trunk/checksums (rev 0)
+++ csw/mgar/pkg/discount/trunk/checksums 2015-03-23 15:11:24 UTC (rev
24760)
@@ -0,0 +1 @@
+fcb1e7a3d19c2e666655fa8a28066e76 discount-2.1.8.tar.gz
Added:
csw/mgar/pkg/discount/trunk/files/0001-Add-specific-include-for-alloca.patch
===================================================================
---
csw/mgar/pkg/discount/trunk/files/0001-Add-specific-include-for-alloca.patch
(rev 0)
+++
csw/mgar/pkg/discount/trunk/files/0001-Add-specific-include-for-alloca.patch
2015-03-23 15:11:24 UTC (rev 24760)
@@ -0,0 +1,24 @@
+From 0189c08c5bd3836c2907fa9733a8facdb4f34f9a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Mon, 23 Mar 2015 13:59:35 +0100
+Subject: [PATCH] Add specific include for alloca()
+
+---
+ theme.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/theme.c b/theme.c
+index 407a68f..fae97ff 100644
+--- a/theme.c
++++ b/theme.c
+@@ -33,6 +33,7 @@
+ #include "mkdio.h"
+ #include "cstring.h"
+ #include "amalloc.h"
++#include <alloca.h>
+
+ char *pgm = "theme";
+ char *output = 0;
+--
+2.3.3
+
Added:
csw/mgar/pkg/discount/trunk/files/0002-We-don-t-have-ldconfig-and-the-line-forces-exitcode-.patch
===================================================================
---
csw/mgar/pkg/discount/trunk/files/0002-We-don-t-have-ldconfig-and-the-line-forces-exitcode-.patch
(rev 0)
+++
csw/mgar/pkg/discount/trunk/files/0002-We-don-t-have-ldconfig-and-the-line-forces-exitcode-.patch
2015-03-23 15:11:24 UTC (rev 24760)
@@ -0,0 +1,34 @@
+From e822b6b672238d10a3dcb3e026b93cd0d8e3e5d5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Mon, 23 Mar 2015 16:03:53 +0100
+Subject: [PATCH] We don't have ldconfig and the line forces exitcode 1
+
+---
+ configure.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.inc b/configure.inc
+index 7b4ac48..d17edef 100755
+--- a/configure.inc
++++ b/configure.inc
+@@ -1304,7 +1304,7 @@ make) FLAGS="$AC_CFLAGS -shared"
+ test "$USE_SONAME" && VFLAGS="-Wl,-soname,\$LIBNAME.\$MAJOR"
+
+ rm -f \$LIBRARY \$LIBNAME \$LIBNAME.\$MAJOR
+- if $AC_CC \$FLAGS \$VFLAGS -o \$FULLNAME "\$@"; then
++ if $AC_CC \$FLAGS \$LDFLAGS \$VFLAGS -o \$FULLNAME "\$@"; then
+ $PROG_LN_S \$FULLNAME \$LIBRARY
+ $PROG_LN_S \$FULLNAME \$LIBNAME
+ $PROG_LN_S \$FULLNAME \$LIBNAME.\$MAJOR
+@@ -1315,7 +1315,7 @@ files) echo "\$FULLNAME" "\$LIBNAME" "\$LIBNAME.\$MAJOR"
+ install)$PROG_INSTALL -c \$FULLNAME "\$1"
+ $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
+ $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
+- test "$LDCONFIG" && $LDCONFIG "\$1"
++ #test "$LDCONFIG" && $LDCONFIG "\$1"
+ ;;
+ esac
+ EOF
+--
+2.3.3
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
