net/catgirl: replace Makefile patch with FAKE_FLAGS

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

net/catgirl: replace Makefile patch with FAKE_FLAGS

Klemens Nanni-2
No PLIST change.
Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/catgirl/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 17 Jan 2021 10:17:51 -0000 1.4
+++ Makefile 19 Jan 2021 17:02:31 -0000
@@ -23,4 +23,7 @@ MASTER_SITES = https://git.causal.agency
 
 NO_TEST = Yes
 
+FAKE_FLAGS = PREFIX=${PREFIX} \
+ MANDIR=${PREFIX}/man
+
 .include <bsd.port.mk>
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 6 Dec 2020 23:02:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2020/12/06 23:02:58 solene Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -1,5 +1,5 @@
- PREFIX ?= /usr/local
--MANDIR ?= ${PREFIX}/share/man
-+MANDIR ?= ${PREFIX}/man
-
- CEXTS = gnu-case-range gnu-conditional-omitted-operand
- CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%}
-@@ -37,23 +37,23 @@ clean:
- rm -f tags catgirl ${OBJS}
-
- install: catgirl catgirl.1
-- install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
-- install catgirl ${DESTDIR}${PREFIX}/bin
-- install -m 644 catgirl.1 ${DESTDIR}${MANDIR}/man1
-+ install -d ${PREFIX}/bin ${MANDIR}/man1
-+ install catgirl ${PREFIX}/bin
-+ install -m 644 catgirl.1 ${MANDIR}/man1
-
- uninstall:
-- rm -f ${DESTDIR}${PREFIX}/bin/catgirl ${DESTDIR}${MANDIR}/man1/catgirl.1
-+ rm -f ${PREFIX}/bin/catgirl ${MANDIR}/man1/catgirl.1
-
- scripts/sandman: scripts/sandman.o
- ${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@
-
- install-sandman: scripts/sandman scripts/sandman.1
-- install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
-- install scripts/sandman ${DESTDIR}${PREFIX}/bin
-- install -m 644 scripts/sandman.1 ${DESTDIR}${MANDIR}/man1
-+ install -d ${PREFIX}/bin ${MANDIR}/man1
-+ install scripts/sandman ${PREFIX}/bin
-+ install -m 644 scripts/sandman.1 ${MANDIR}/man1
-
- uninstall-sandman:
-- rm -f ${DESTDIR}${PREFIX}/bin/sandman ${DESTDIR}${MANDIR}/man1/sandman.1
-+ rm -f ${PREFIX}/bin/sandman ${MANDIR}/man1/sandman.1
-
- CHROOT_USER = chat
- CHROOT_GROUP = ${CHROOT_USER}

Reply | Threaded
Open this post in threaded view
|

Re: net/catgirl: replace Makefile patch with FAKE_FLAGS

Solene Rapenne
On Tue, 19 Jan 2021 18:03:48 +0100
Klemens Nanni <[hidden email]>:

> No PLIST change.
> Feedback? OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/catgirl/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 17 Jan 2021 10:17:51 -0000 1.4
> +++ Makefile 19 Jan 2021 17:02:31 -0000
> @@ -23,4 +23,7 @@ MASTER_SITES = https://git.causal.agency
>  
>  NO_TEST = Yes
>  
> +FAKE_FLAGS = PREFIX=${PREFIX} \
> + MANDIR=${PREFIX}/man
> +
>  .include <bsd.port.mk>
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile 6 Dec 2020 23:02:58 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,44 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2020/12/06 23:02:58 solene Exp $
> -
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -1,5 +1,5 @@
> - PREFIX ?= /usr/local
> --MANDIR ?= ${PREFIX}/share/man
> -+MANDIR ?= ${PREFIX}/man
> -
> - CEXTS = gnu-case-range gnu-conditional-omitted-operand
> - CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%}
> -@@ -37,23 +37,23 @@ clean:
> - rm -f tags catgirl ${OBJS}
> -
> - install: catgirl catgirl.1
> -- install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
> -- install catgirl ${DESTDIR}${PREFIX}/bin
> -- install -m 644 catgirl.1 ${DESTDIR}${MANDIR}/man1
> -+ install -d ${PREFIX}/bin ${MANDIR}/man1
> -+ install catgirl ${PREFIX}/bin
> -+ install -m 644 catgirl.1 ${MANDIR}/man1
> -
> - uninstall:
> -- rm -f ${DESTDIR}${PREFIX}/bin/catgirl ${DESTDIR}${MANDIR}/man1/catgirl.1
> -+ rm -f ${PREFIX}/bin/catgirl ${MANDIR}/man1/catgirl.1
> -
> - scripts/sandman: scripts/sandman.o
> - ${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@
> -
> - install-sandman: scripts/sandman scripts/sandman.1
> -- install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
> -- install scripts/sandman ${DESTDIR}${PREFIX}/bin
> -- install -m 644 scripts/sandman.1 ${DESTDIR}${MANDIR}/man1
> -+ install -d ${PREFIX}/bin ${MANDIR}/man1
> -+ install scripts/sandman ${PREFIX}/bin
> -+ install -m 644 scripts/sandman.1 ${MANDIR}/man1
> -
> - uninstall-sandman:
> -- rm -f ${DESTDIR}${PREFIX}/bin/sandman ${DESTDIR}${MANDIR}/man1/sandman.1
> -+ rm -f ${PREFIX}/bin/sandman ${MANDIR}/man1/sandman.1
> -
> - CHROOT_USER = chat
> - CHROOT_GROUP = ${CHROOT_USER}

this is a LOT better, thank you for these changes
ok solene@