minipro: update to version 0.7 (#10791)

Also includes:
- manpage support fix
- data location fix
- bash completion support

Signed-off-by: Maxime Chretien <mchretien@linuxmail.org>
This commit is contained in:
Maxime Chretien
2024-08-13 08:20:15 +02:00
committed by GitHub
parent 1d9f09c05c
commit 59197ef5c9
2 changed files with 31 additions and 20 deletions

View File

@@ -10,7 +10,7 @@ COPYRIGHT="2014-2024 David Griffith"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://gitlab.com/DavidGriffith/minipro/-/archive/$portVersion/minipro-$portVersion.tar.gz"
CHECKSUM_SHA256="16b4220b5fc07dddc4d1d49cc181a2c6a735c833cc27f24ab73eac2572c9304a"
CHECKSUM_SHA256="54eb59f5fe2e1850f08baaefcf2306ed770f7cdb91b3f58e8610849334a5a6f4"
PATCHES="minipro-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -48,14 +48,28 @@ BUILD_PREREQUIRES="
BUILD()
{
DEST_DIR=$installDestDir PREFIX=$prefix SHARE_DIR=$relativeDataDir make $jobArgs
DEST_DIR=$installDestDir PREFIX=$prefix SHARE_DIR=$relativeDataDir make library $jobArgs
PREFIX=$prefix \
SHARE_DIR=$relativeDataDir/minipro \
make $jobArgs
PREFIX=$prefix \
SHARE_DIR=$relativeDataDir/minipro \
make library $jobArgs
}
INSTALL()
{
DEST_DIR=$installDestDir PREFIX=$prefix BIN_DIR=$relativeBinDir SHARE_DIR=$relativeDataDir MAN_DIR=$relativeManDir make install
DEST_DIR=$installDestDir PREFIX=$prefix LIB_DIR=$relativeDevelopLibDir INCLUDE_DIR=$relativeIncludeDir/libminipro make install_library
PREFIX=$prefix \
BIN_DIR=$relativeBinDir \
SHARE_DIR=$relativeDataDir/minipro \
MAN_DIR=$relativeManDir/man1 \
COMPLETIONS_DIR=$dataDir/bash-completion/completions \
make install
PREFIX=$prefix \
LIB_DIR=$relativeDevelopLibDir \
INCLUDE_DIR=$relativeIncludeDir/libminipro \
make install_library
packageEntries devel $developDir
}

View File

@@ -1,4 +1,4 @@
From cf0c466939d5e6af78ecd766ca8f6459ebd64845 Mon Sep 17 00:00:00 2001
From 233a09cb4c881da438f52c3d941f511d1f5dbe0d Mon Sep 17 00:00:00 2001
From: Maxime Chretien <mchretien@linuxmail.org>
Date: Wed, 24 Jan 2024 21:00:19 +0100
Subject: Adapt Makefile for Haiku
@@ -6,21 +6,12 @@ Subject: Adapt Makefile for Haiku
Signed-off-by: Maxime Chretien <mchretien@linuxmail.org>
diff --git a/Makefile b/Makefile
index f2eeeb4..2f7711b 100644
index f727e22..a4815f2 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ MANDIR ?= $(PREFIX)/share/man
##########################################################################
NAME = minipro
-VERSION = 0.5
+VERSION = 0.6
# If we're working from git, we have access to proper variables. If
# not, make it clear that we're working from a release.
@@ -67,12 +67,18 @@ LOGICIC=logicic.xml
@@ -68,17 +68,23 @@ LOGICIC=logicic.xml
TESTS=$(wildcard tests/test_*.c);
OBJCOPY=objcopy
OBJCOPY?=objcopy
+BIN_DIR ?= bin
+LIB_DIR ?= lib
@@ -42,7 +33,13 @@ index f2eeeb4..2f7711b 100644
UDEV_DIR=$(shell $(PKG_CONFIG) --define-variable=prefix=$(PREFIX) --silence-errors --variable=udevdir udev)
UDEV_RULES_INSTDIR=$(DESTDIR)$(UDEV_DIR)/rules.d
@@ -170,12 +176,10 @@ install_library:
-COMPLETIONS_DIR=$(shell $(PKG_CONFIG) --define-variable=prefix=$(PREFIX) --silence-errors --variable=completionsdir bash-completion)
+COMPLETIONS_DIR ?= $(shell $(PKG_CONFIG) --define-variable=prefix=$(PREFIX) --silence-errors --variable=completionsdir bash-completion)
COMPLETIONS_INSTDIR=$(DESTDIR)$(COMPLETIONS_DIR)
ifneq ($(OS),Windows_NT)
@@ -171,12 +177,10 @@ install_library:
cp $(STATIC_LIB) $(LIB_INSTDIR)/
cp *.h $(INCLUDE_INSTDIR)/
cp libminipro.pc $(LIB_INSTDIR)/pkgconfig/
@@ -58,5 +55,5 @@ index f2eeeb4..2f7711b 100644
rm -f $(LIB_INSTDIR)/$(STATIC_LIB)
rm -f $(INCLUDE_INSTDIR)/*.h
--
2.42.1
2.45.2