diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile index 660d3bcfcc8a..c030bfc6e840 100644 --- a/x11-clocks/wmcalclock/Makefile +++ b/x11-clocks/wmcalclock/Makefile @@ -1,30 +1,30 @@ PORTNAME= wmCalClock PORTVERSION= 1.26 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://jmpacquet.free.fr/wmcalclock/ MAINTAINER= hrs@FreeBSD.org COMMENT= Another Window Maker calendar/clock dockapp WWW= http://jmpacquet.free.fr/wmcalclock/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING USES= xorg USE_XORG= x11 xext xpm MAKE_ENV= OPSYS=${OPSYS} WRKSRC= ${WRKDIR}/${DISTNAME}/Src -PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/wmCalClock share/man/man1/${PORTNAME}.1.gz PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO OPTIONS_DEFINE= DOCS pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} post-install-DOCS-on: cd ${WRKDIR}/${DISTNAME} && \ ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/x11-clocks/wmcalclock/files/patch-Makefile b/x11-clocks/wmcalclock/files/patch-Makefile index d16bea2c32bd..899a98f1a20e 100644 --- a/x11-clocks/wmcalclock/files/patch-Makefile +++ b/x11-clocks/wmcalclock/files/patch-Makefile @@ -1,41 +1,41 @@ --- Makefile.orig 1999-03-27 06:46:38 UTC +++ Makefile @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 +INCDIR = -I${LOCALBASE}/include +LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext @@ -15,14 +14,14 @@ OBJS = wmCalClock.o \ .c.o: - $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) + $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) all: wmCalClock.o wmCalClock wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm wmCalClock: $(OBJS) - $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS) + $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $(OBJS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ -@@ -31,6 +30,6 @@ clean: +@@ -31,6 +30,6 @@ install:: wmCalClock rm -f wmCalClock install:: wmCalClock - install -c -s -m 0755 wmCalClock $(DESTDIR)/bin - install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 + ${BSD_INSTALL_PROGRAM} wmCalClock $(DESTDIR)$(PREFIX)/bin -+ ${BSD_INSTALL_MAN} wmCalClock.1 $(DESTDIR)$(PREFIX)/man/man1 ++ ${BSD_INSTALL_MAN} wmCalClock.1 $(DESTDIR)$(PREFIX)/share/man/man1