Paragui: add recipe.

Fixes http://ports.haiku-files.org/ticket/83
This commit is contained in:
Adrien Destugues
2015-04-19 17:06:58 +02:00
parent 1e2667e645
commit 08af75dcce
3 changed files with 148 additions and 28 deletions

View File

@@ -1,28 +0,0 @@
diff -urN paragui-1.1.8/Makefile.am paragui-1.1.8-haiku/Makefile.am
--- paragui-1.1.8/Makefile.am 2004-10-18 18:48:10.047710208 +0000
+++ paragui-1.1.8-haiku/Makefile.am 2010-05-29 01:02:52.581435392 +0000
@@ -59,8 +59,8 @@
mkdir $(distdir)/lib
cp $(srcdir)/lib/README.txt $(distdir)/lib
-install-hook:
- -ldconfig
+#install-hook:
+# -ldconfig
rpm: $(PACKAGE)-$(VERSION).tar.gz
cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
diff -urN paragui-1.1.8/configure.in paragui-1.1.8-haiku/configure.in
--- paragui-1.1.8/configure.in 2004-10-18 18:58:09.047710208 +0000
+++ paragui-1.1.8-haiku/configure.in 2010-05-29 01:01:16.400818176 +0000
@@ -1,8 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
+m4_pattern_allow([^PKG_SIGC$])
AC_INIT(README)
AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
-
+AC_CONFIG_MACRO_DIR([m4])
TOP_BUILDDIR=`pwd`
AC_SUBST(TOP_BUILDDIR)

View File

@@ -0,0 +1,66 @@
From 441d86baff3474f78b156f4217660896a5cb0d23 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 17:03:19 +0200
Subject: Modernize autotools scripts.
diff --git a/Makefile.am b/Makefile.am
index 576f832..7300ac6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,8 +59,8 @@ dist-hook:
mkdir $(distdir)/lib
cp $(srcdir)/lib/README.txt $(distdir)/lib
-install-hook:
- -ldconfig
+#install-hook:
+# -ldconfig
rpm: $(PACKAGE)-$(VERSION).tar.gz
cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
diff --git a/configure.in b/configure.in
index 3913ed9..54afe8f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(README)
-AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
+AC_CONFIG_HEADERS(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
TOP_BUILDDIR=`pwd`
@@ -12,7 +12,6 @@ SDL_VERSION=1.2.6
dnl we also need libSigC++ (yeah)
SIGC_VERSION=1.2.5
-PKG_SIGC="sigc++-1.2"
dnl Set various version strings - taken gratefully from the GTk sources
@@ -227,7 +226,7 @@ AC_SUBST(LIBSTDCPP)
dnl Check for libSigC++
-PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
+PKG_CHECK_MODULES(SIGC, "sigc++-1.2" >= $SIGC_VERSION)
AC_SUBST(SIGC_CFLAGS)
AC_SUBST(SIGC_LIBS)
@@ -388,9 +387,10 @@ else
PHYSFS_LIB="./physfs/libphysfs.la"
PHYSFS_SUBDIR="physfs"
LIBPHYSFS=""
+
+# AC_CONFIG_SUBDIRS(src/physfs)
fi
-AC_CONFIG_SUBDIRS(src/physfs)
AC_SUBST(PHYSFS_INCLUDE)
AC_SUBST(PHYSFS_LIB)
--
2.2.2