openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to farbfeld-4

Browse Source 
From Kaashif Hymabaccus, with input from sthen and me.

OK solene, sthen
This commit is contained in:
kn
2018-04-28 16:31:12 +00:00
parent 2937af3f9b
commit 2d610b2172
4 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/farbfeld/Makefile
+13 -4
View File
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
# $OpenBSD: Makefile,v 1.2 2018/04/28 16:31:12 kn Exp $
COMMENT = lossless, uncompressed graphics format
DISTNAME = farbfeld-3
DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,18 @@ LIB_DEPENDS = graphics/png \
RUN_DEPENDS = graphics/ImageMagick
USE_GMAKE = Yes
MAKE_ENV = CC="${CC}"
MAKE_FLAGS = CC='${CC}' \
CFLAGS='${CFLAGS} -I${LOCALBASE}/include' \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
NO_TEST = Yes
do-install:
${INSTALL_PROGRAM} \
${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
.include <bsd.port.mk>
graphics/farbfeld/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
SIZE (farbfeld-3.tar.gz) = 10169
SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
SIZE (farbfeld-4.tar.gz) = 10340
graphics/farbfeld/patches/patch-Makefile
-27
View File
@@ -1,27 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -38,15 +38,12 @@ dist:
rm -rf "farbfeld-$(VERSION)"
install: all
- mkdir -p "$(DESTDIR)$(PREFIX)/bin"
- cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
- for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
- mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
- cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
- for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
- mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
- cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
- for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
+ ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
+ ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
+ ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
+ ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
uninstall:
for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
graphics/farbfeld/patches/patch-config_mk
+6 -15
View File
@@ -1,25 +1,16 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
$OpenBSD: patch-config_mk,v 1.2 2018/04/28 16:31:12 kn Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
@@ -4,15 +4,15 @@ VERSION = 3
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX ?= /usr/local
MANPREFIX = ${PREFIX}/man
@@ -9,8 +9,8 @@ MANPREFIX = $(PREFIX)/share/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
PNG-LDFLAGS = -lpng
JPG-LDFLAGS = -ljpeg
+CFLAGS += -std=c99 -pedantic -Wall -Wextra
+LDFLAGS += -s
PNG-LDLIBS = -lpng
JPG-LDLIBS = -ljpeg
# compiler and linker
-CC = cc
+CC ?= cc