Index: head/misc/owrep/Makefile =================================================================== --- head/misc/owrep/Makefile (revision 464194) +++ head/misc/owrep/Makefile (revision 464195) @@ -1,18 +1,28 @@ # $FreeBSD$ 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 LIB_DEPENDS= libexpat.so:textproc/expat2 USES= localbase:ldflags zip + +post-patch: + @${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' \ + ${WRKSRC}/owrep.c ${WRKSRC}/owrep.1 + +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 Index: head/misc/owrep/distinfo =================================================================== --- head/misc/owrep/distinfo (revision 464194) +++ head/misc/owrep/distinfo (revision 464195) @@ -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 Index: head/misc/owrep/files/patch-Makefile =================================================================== --- head/misc/owrep/files/patch-Makefile (revision 464194) +++ head/misc/owrep/files/patch-Makefile (revision 464195) @@ -1,41 +1,36 @@ ---- 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 # -INSTALL_TO = /usr/local/bin -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) - $(CC) -o $(.TARGET) -L /usr/local/lib $(LIBS) $(.ALLSRC) + $(CC) -o $(.TARGET) $(LDFLAGS) $(LIBS) $(.ALLSRC) # 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) Index: head/misc/owrep/pkg-descr =================================================================== --- head/misc/owrep/pkg-descr (revision 464194) +++ head/misc/owrep/pkg-descr (revision 464195) @@ -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 Index: head/misc/owrep/pkg-plist =================================================================== --- head/misc/owrep/pkg-plist (revision 464194) +++ head/misc/owrep/pkg-plist (revision 464195) @@ -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