diff options
| author | Satoshi Taoka <taoka@FreeBSD.org> | 2000-09-27 15:32:10 +0000 |
|---|---|---|
| committer | Satoshi Taoka <taoka@FreeBSD.org> | 2000-09-27 15:32:10 +0000 |
| commit | b83307790bc0b8be0dc3eff48674d8201df430da (patch) | |
| tree | ce6ae0bbdd9d54ca5997867b8f2ff6d04f7e9efb /sysutils | |
| parent | Update files/md5 because distfiles was updated but these are same file names. (diff) | |
Update to version 3.1
PR: ports/21374
Submitted by: tkato@prontomail.ne.jp (KATO Tsuguru)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/wmapm/Makefile | 18 | ||||
| -rw-r--r-- | sysutils/wmapm/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/wmapm/files/patch-aa | 36 |
3 files changed, 31 insertions, 25 deletions
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile index c588b42ce27a..d6a2758a1267 100644 --- a/sysutils/wmapm/Makefile +++ b/sysutils/wmapm/Makefile @@ -6,28 +6,22 @@ # PORTNAME= wmapm -PORTVERSION= 3.01 +PORTVERSION= 3.1 CATEGORIES= sysutils windowmaker MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= taoka@FreeBSD.org -WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm -USE_GMAKE= yes ONLY_FOR_ARCHS= i386 + +WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm + USE_X_PREFIX= yes USE_XPM= yes +MAN1= wmapm.1 + BINMODE= 2755 BINGRP= operator -pre-build: - cd ${WRKDIR}/${DISTNAME}/wmapm; ${GMAKE} clean - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmapm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmapm.1 ${PREFIX}/man/man1 - -MAN1= wmapm.1 - .include <bsd.port.mk> diff --git a/sysutils/wmapm/distinfo b/sysutils/wmapm/distinfo index dba2f58632ce..6b22c7489c6b 100644 --- a/sysutils/wmapm/distinfo +++ b/sysutils/wmapm/distinfo @@ -1 +1 @@ -MD5 (wmapm-3.01.tar.gz) = 36f58c8125f5faabe3c9d16474d81cd3 +MD5 (wmapm-3.1.tar.gz) = 5a62620d49b5cc4c2250e013149ca1e9 diff --git a/sysutils/wmapm/files/patch-aa b/sysutils/wmapm/files/patch-aa index 8a7ad23a27d0..acc9fc664756 100644 --- a/sysutils/wmapm/files/patch-aa +++ b/sysutils/wmapm/files/patch-aa @@ -1,28 +1,40 @@ ---- Makefile.orig Tue Dec 15 16:58:08 1998 -+++ Makefile Wed Aug 25 23:55:58 1999 -@@ -1,6 +1,6 @@ +--- Makefile.orig Wed Jan 12 01:42:25 2000 ++++ Makefile Tue Sep 19 05:24:13 2000 +@@ -1,20 +1,20 @@ -CC = gcc -CFLAGS = -O2 -Wall --INCDIR = -I/usr/X11R6/include/X11 -+CC? = gcc -+CFLAGS? = -O2 -Wall -+INCDIR = -I/usr/X11R6/include - DESTDIR= /usr/X11R6 - LIBDIR = -L/usr/X11R6/lib +-INCDIR = -I/usr/X11R6/include +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 -Wall ++INCDIR = -I${X11BASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${X11BASE}/lib LIBS = -lXpm -lX11 -lXext -@@ -8,13 +8,13 @@ + OBJS = wmapm.o \ ../wmgeneral/wmgeneral.o .c.o: - $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) -+ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) ++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) all: wmapm.o wmapm wmapm.o: wmapm_master.xpm wmapm_mask.xbm wmapm.h wmapm: $(OBJS) - $(CC) $(COPTS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS) -+ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $(OBJS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ +@@ -23,7 +23,6 @@ + rm -f wmapm + + install:: wmapm +- install -s -m 0755 wmapm $(DESTDIR)/bin +- install -m 0644 wmapm.1 $(DESTDIR)/man/man1 +- chmod +s $(DESTDIR)/bin/wmapm ++ ${BSD_INSTALL_PROGRAM} wmapm $(DESTDIR)/bin ++ ${BSD_INSTALL_MAN} wmapm.1 $(DESTDIR)/man/man1 + |