Attachment 191428 Details for Bug 226535 – Patches to files in port directory (2 new files)

[patch] Patches to files in port directory (2 new files)

owrep.diff (text/plain), 4.99 KB, created by Bob Eager on 2018-03-11 18:54:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2018-03-11 18:54:51 UTC

Size: 4.99 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with cdiff -s -w 0
>diff -ruN ../owrep.orig/Makefile ./Makefile
>--- ../owrep.orig/Makefile	2018-03-06 22:47:09.288340000 +0000
>+++ ./Makefile	2018-03-07 09:23:46.023804000 +0000
>@@ -1,13 +1,13 @@
> # $FreeBSD: head/misc/owrep/Makefile 454323 2017-11-16 18:41:01Z yuri $
> 
> PORTNAME=	owrep
>-DISTVERSION=	1.1
>+DISTVERSION=	1.2
> CATEGORIES=	misc
> MASTER_SITES=	http://www.ml1.org.uk/distfiles/ \
> 		http://www.ancientgeek.org.uk/distfiles/
> 
> MAINTAINER=	bob@eager.cx
>-COMMENT=	Weather reporting program based on openweathermap.org
>+COMMENT=	Weather reporting program using openweathermap.org
> 
> LICENSE=	BSD3CLAUSE
> 
>@@ -15,4 +15,16 @@
> 
> USES=		localbase:ldflags zip
> 
>-.include <bsd.port.mk>
>+post-patch:
>+		@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/owrep.c
>+		@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/owrep.1
>+
>+.include <bsd.port.pre.mk>
>+
>+do-install:
>+		${INSTALL_PROGRAM} ${WRKSRC}/owrep ${STAGEDIR}${PREFIX}/bin
>+		${INSTALL_MAN} ${WRKSRC}/owrep.1 ${STAGEDIR}${PREFIX}/man/man1
>+		${INSTALL_MAN} ${WRKSRC}/owrep.conf.5 ${STAGEDIR}${PREFIX}/man/man5
>+		${INSTALL_DATA} ${WRKSRC}/owrep.conf.sample ${STAGEDIR}${PREFIX}/etc
>+
>+.include <bsd.port.post.mk>
>diff -ruN ../owrep.orig/distinfo ./distinfo
>--- ../owrep.orig/distinfo	2018-03-06 22:47:09.288791000 +0000
>+++ ./distinfo	2018-03-06 23:02:25.525001000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1508972794
>-SHA256 (owrep-1.1.zip) = 53e3ac6951b59619d817230cbf5f514961911ad625bfec4922094189963dfc0a
>-SIZE (owrep-1.1.zip) = 21700
>+TIMESTAMP = 1520377345
>+SHA256 (owrep-1.2.zip) = bd4b91cb7699c24dd2f58416b0973395eed2c701678dca24bb523e14003cee5e
>+SIZE (owrep-1.2.zip) = 21747
>diff -ruN ../owrep.orig/files/patch-Makefile ./files/patch-Makefile
>--- ../owrep.orig/files/patch-Makefile	2018-03-06 22:47:09.289269000 +0000
>+++ ./files/patch-Makefile	2018-03-07 09:23:12.120650000 +0000
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2017-05-30 23:54:30 UTC
>+--- Makefile.orig	2018-03-04 22:14:18 UTC
> +++ Makefile
>-@@ -5,10 +5,10 @@
>+@@ -5,11 +5,6 @@
>  #
>  CC?=		clang
>  #
>@@ -8,14 +8,11 @@
> -INSTALL_MAN1=	/usr/local/man/man1
> -INSTALL_MAN5=	/usr/local/man/man5
> -INSTALL_ETC=	/usr/local/etc
>-+INSTALL_TO =	$(DESTDIR)/$(PREFIX)/bin
>-+INSTALL_MAN1=	$(DESTDIR)/$(PREFIX)/man/man1
>-+INSTALL_MAN5=	$(DESTDIR)/$(PREFIX)/man/man5
>-+INSTALL_ETC=	$(DESTDIR)/$(PREFIX)/etc
>- #
>+-#
>  PRODUCT =	owrep
>  #
>-@@ -38,7 +38,7 @@ CFLAGS+=	-O2 $(COMFLAGS) -I /usr/local/i
>+ SRC =		owrep.c config.c extract.c lookup.c massage.c netio.c output.c
>+@@ -38,20 +33,11 @@ CFLAGS+=	-O2 $(COMFLAGS) -I /usr/local/i
>  all:		$(PRODUCT)
>  #
>  $(PRODUCT):	$(OBJ)
>@@ -24,18 +21,16 @@
>  #
>  depend:
>  		mkdep $(CFLAGS) $(SRC)
>-@@ -46,10 +46,10 @@ depend:
>- install:	$(PRODUCT)
>- 		gzip -f -k $(MAN1)
>- 		gzip -f -k $(MAN5)
>+ #
>+-install:	$(PRODUCT)
>+-		gzip -f -k $(MAN1)
>+-		gzip -f -k $(MAN5)
> -		install -s -g wheel -o root $(PRODUCT) $(INSTALL_TO)
> -		install -g wheel -o root $(MAN1).gz $(INSTALL_MAN1)
> -		install -g wheel -o root $(MAN5).gz $(INSTALL_MAN5)
> -		install -g wheel -o root $(CONF) $(INSTALL_ETC)
>-+		install -s $(PRODUCT) $(INSTALL_TO)
>-+		install $(MAN1).gz $(INSTALL_MAN1)
>-+		install $(MAN5).gz $(INSTALL_MAN5)
>-+		install $(CONF) $(INSTALL_ETC)
>- 		rm -f $(MAN1).gz $(MAN5).gz
>- #
>+-		rm -f $(MAN1).gz $(MAN5).gz
>+-#
>  distfile:
>+ 		@mkdir -p $(DISTNAME)
>+ 		@cp -a $(SRC) $(HDR) $(DISTNAME)
>diff -ruN ../owrep.orig/files/patch-owrep.1 ./files/patch-owrep.1
>--- ../owrep.orig/files/patch-owrep.1	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-owrep.1	2018-03-07 09:23:12.121834000 +0000
>@@ -0,0 +1,13 @@
>+--- owrep.1.orig	2018-03-07 09:22:26 UTC
>++++ owrep.1
>+@@ -105,8 +105,8 @@ provided.
>+ .It 34 Ta time Ta Time of last update
>+ .El
>+ .Sh FILES
>+-.Bl -tag -width /usr/local/etc/owrep.conf -compact
>+-.It Pa /usr/local/etc/owrep.conf
>++.Bl -tag -width %%PREFIX%%/etc/owrep.conf -compact
>++.It Pa %%PREFIX%%/etc/owrep.conf
>+ default configuration file
>+ .El
>+ .Sh EXIT STATUS
>diff -ruN ../owrep.orig/files/patch-owrep.c ./files/patch-owrep.c
>--- ../owrep.orig/files/patch-owrep.c	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-owrep.c	2018-03-07 09:23:12.123471000 +0000
>@@ -0,0 +1,11 @@
>+--- owrep.c.orig	2018-03-04 22:10:17 UTC
>++++ owrep.c
>+@@ -20,7 +20,7 @@
>+ 
>+ #include "owrep.h"
>+ 
>+-#define	DEFAULT_CONFIG	"/usr/local/etc/owrep.conf"
>++#define	DEFAULT_CONFIG	"%%PREFIX%%/etc/owrep.conf"
>+ 
>+ /* Forward references */
>+ 
>diff -ruN ../owrep.orig/pkg-descr ./pkg-descr
>--- ../owrep.orig/pkg-descr	2018-03-06 22:47:09.290010000 +0000
>+++ ./pkg-descr	2018-03-06 23:00:29.601172000 +0000
>@@ -1,4 +1,4 @@
> This is a basic weather reporting program. It uses data from
> openweathermap.org, and uses a worldwide database.
> 
>-WWW: http://www.tavi.co.uk
>+WWW: http://www.bobeager.uk/software.html
>diff -ruN ../owrep.orig/pkg-plist ./pkg-plist
>--- ../owrep.orig/pkg-plist	2018-03-06 22:47:09.290510000 +0000
>+++ ./pkg-plist	2018-03-06 23:00:20.713263000 +0000
>@@ -1,4 +1,4 @@
> bin/owrep
>-%%ETCDIR%%.conf.sample
>+@sample etc/owrep.conf.sample
> man/man1/owrep.1.gz
> man/man5/owrep.conf.5.gz
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 226535: 191428