diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile index 21417378bc27..09655f6d0718 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -1,25 +1,25 @@ PORTNAME= wmnet PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net windowmaker MASTER_SITES= http://vault.101011010.xyz/distfiles/ \ http://freebsd.nsu.ru/distfiles/ \ LOCAL/danfe LOCAL/novel MAINTAINER= danfe@FreeBSD.org COMMENT= Network bandwidth monitor for Window Maker dock LICENSE= GPLv2+ USES= xorg USE_XORG= x11 xext xpm PORTDOCS= CHANGELOG README OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/net/wmnet/files/patch-Makefile b/net/wmnet/files/patch-Makefile index 1be8854b6b5b..4700cded574d 100644 --- a/net/wmnet/files/patch-Makefile +++ b/net/wmnet/files/patch-Makefile @@ -1,44 +1,45 @@ ---- Makefile.orig 1998-12-03 23:33:58.000000000 +0800 -+++ Makefile 2014-06-24 15:23:31.901094203 +0800 +--- Makefile.orig 1998-12-03 15:33:58 UTC ++++ Makefile @@ -2,22 +2,24 @@ # Makefile,v 1.8 1998/12/03 15:33:58 rneswold Exp # -PREFIX=/usr/local - MANDIR=${PREFIX}/man +-MANDIR=${PREFIX}/man ++MANDIR=${PREFIX}/share/man BINDIR=${PREFIX}/bin -LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib +LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -lkvm OBJS = main.o if.o wmgeneral.o -INCDIR = -I${X11BASE}/include +INCDIR = -I${LOCALBASE}/include -+ + +CC ?= cc +CFLAGS ?= -O - ++ .c.o : - cc -c -g -O1 -Wall ${INCDIR} $< -o $*.o + $(CC) -c $(CFLAGS) -g -Wall ${INCDIR} $< -o $*.o all :: wmnet wmnet : $(OBJS) - cc -o wmnet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR} + $(CC) -o wmnet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR} main.o : wmnet-mask.xbm wmnet-master.xpm wmnet.h wmgeneral.h -@@ -29,9 +31,9 @@ clean : +@@ -29,9 +31,9 @@ install.man : wmnet.1 rm -f $(OBJS) wmnet install.man : wmnet.1 - install -c -m 644 -o man -g man wmnet.1 ${MANDIR}/man1 + install -c -m 644 wmnet.1 $(DESTDIR)${MANDIR}/man1 install.bin : wmnet - install -s -c -m 2555 -o bin -g kmem wmnet ${BINDIR} + install -s -c wmnet $(DESTDIR)${BINDIR} install : install.bin install.man diff --git a/net/wmnet/pkg-plist b/net/wmnet/pkg-plist index 9c5e2ebaedf5..e77c45f88dd9 100644 --- a/net/wmnet/pkg-plist +++ b/net/wmnet/pkg-plist @@ -1,8 +1,8 @@ @owner bin @group kmem @mode 2555 bin/wmnet @mode @group @owner -man/man1/wmnet.1.gz +share/man/man1/wmnet.1.gz