Attachment 10215 Details for Bug 20548 – file.diff

[patch] file.diff

file.diff (text/plain), 2.85 KB, created by tkato on 2000-08-12 01:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-08-12 01:00:02 UTC

Size: 2.85 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/wmbattery/Makefile sysutils/wmbattery/Makefile
>--- /usr/ports/sysutils/wmbattery/Makefile	Thu Aug  3 21:31:12 2000
>+++ sysutils/wmbattery/Makefile	Sat Aug 12 00:08:40 2000
>@@ -17,17 +17,13 @@
> 
> USE_X_PREFIX=	yes
> USE_XPM=	yes
>-USE_GMAKE=	yes
>-MAKE_ENV=	PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>-		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
> ALL_TARGET=	wmbattery
> MAN1=		wmbattery.1
> 
>-# install additional docs
>-.if !defined(NOPORTDOCS)
> post-install:
>-.for i in COPYING INSTALL README TODO
>-	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/wmbattery
>+.if !defined(NOPORTDOCS)
>+.for i in INSTALL README TODO
>+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/wmbattery
> .endfor
> .endif
> 
>diff -urN /usr/ports/sysutils/wmbattery/patches/patch-aa sysutils/wmbattery/patches/patch-aa
>--- /usr/ports/sysutils/wmbattery/patches/patch-aa	Fri May 19 23:20:22 2000
>+++ sysutils/wmbattery/patches/patch-aa	Sat Aug 12 00:12:07 2000
>@@ -6,7 +6,7 @@
> -MANDIR  = /usr/X11R6/man/man1
> -INCDIR  = -I/usr/X11R6/include
> -LIBDIR  = -L/usr/X11R6/lib
>-+PREFIX	= /usr/X11R6
>++PREFIX	?= /usr/X11R6
> +ICONDIR = $(PREFIX)/share/wmbattery/icons
> +BINDIR  = $(PREFIX)/bin
> +MANDIR  = $(PREFIX)/man/man1
>@@ -14,7 +14,7 @@
> +LIBDIR  = -L$(PREFIX)/lib
>  LIBS    = -lXpm -lXext
> -CFLAGS  = $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\" -O2 -Wall
>-+CFLAGS += $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\"
>++CFLAGS += $(INCDIR) -DICONDIR=\"$(ICONDIR)\"
>  
>  wmbattery: wmbattery.c wmbattery.h
>  	$(CC) $(CFLAGS) $(LIBDIR) $(LIBS) wmbattery.c -o wmbattery
>@@ -26,10 +26,10 @@
> -	install -c -s wmbattery $(PREFIX)$(BINDIR)
> -	install -c -m 644 wmbattery.1x $(PREFIX)$(MANDIR)/wmbattery.1
> -	install -c -m 644 *.xpm $(PREFIX)$(ICONDIR)
>-+	install -c -d $(ICONDIR) $(BINDIR) $(MANDIR)
>-+	$(INSTALL_PROGRAM) wmbattery $(BINDIR)
>-+	$(INSTALL_MAN) wmbattery.1x $(MANDIR)/wmbattery.1
>-+	$(INSTALL_DATA) *.xpm $(ICONDIR)
>++	-mkdir -p $(ICONDIR) $(BINDIR) $(MANDIR)
>++	${BSD_INSTALL_PROGRAM} wmbattery $(BINDIR)
>++	${BSD_INSTALL_MAN} wmbattery.1x $(MANDIR)/wmbattery.1
>++	${BSD_INSTALL_DATA} *.xpm $(ICONDIR)
>  
>  test: wmbattery
>  	./wmbattery
>diff -urN /usr/ports/sysutils/wmbattery/pkg/COMMENT sysutils/wmbattery/pkg/COMMENT
>--- /usr/ports/sysutils/wmbattery/pkg/COMMENT	Thu Oct 21 13:29:02 1999
>+++ sysutils/wmbattery/pkg/COMMENT	Sat Aug 12 00:12:17 2000
>@@ -1 +1 @@
>-WindowMaker dockapp that displays info about your battery
>+Window Maker dockapp that displays info about your battery
>diff -urN /usr/ports/sysutils/wmbattery/pkg/PLIST sysutils/wmbattery/pkg/PLIST
>--- /usr/ports/sysutils/wmbattery/pkg/PLIST	Thu Oct 21 13:29:02 1999
>+++ sysutils/wmbattery/pkg/PLIST	Sat Aug 12 00:23:09 2000
>@@ -11,7 +11,6 @@
> share/wmbattery/icons/unplugged.xpm
> share/wmbattery/icons/plugged.xpm
> share/wmbattery/icons/bigfont.xpm
>-share/wmbattery/COPYING
> share/wmbattery/INSTALL
> share/wmbattery/README
> share/wmbattery/TODO

Actions: View | Diff

Attachments on bug 20548: 10215