diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/asmem/Makefile | 30 | ||||
| -rw-r--r-- | sysutils/asmem/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/asmem/files/patch-aa | 88 | ||||
| -rw-r--r-- | sysutils/asmem/files/patch-ac | 18 |
4 files changed, 69 insertions, 69 deletions
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile index 6275b91d5deb..a923380f3201 100644 --- a/sysutils/asmem/Makefile +++ b/sysutils/asmem/Makefile @@ -5,30 +5,30 @@ # $FreeBSD$ # -PORTNAME= asmem -PORTVERSION= 1.5 -CATEGORIES= sysutils afterstep -MASTER_SITES= ftp://ftp.afterstep.org/apps/asmem/ \ - http://www.bewoner.dma.be/Albert/software/ +PORTNAME= asmem +PORTVERSION= 1.6 +CATEGORIES= sysutils afterstep +MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \ + http://www.bewoner.dma.be/Albert/software/ +MASTER_SITE_SUBDIR= apps/asmem MAINTAINER= jack@germanium.xtalwind.net LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -.include <bsd.port.pre.mk> -#.if ${OSVERSION} >= 400000 -#BROKEN= "Sorry, asmem doesn't compile on 4.0+" -#.endif - USE_X_PREFIX= yes - MAKEFILE= Makefile.UNIX - MAN1= asmem.1 +MAKE_ENV+= PCFLAGS="${CFLAGS}" + +.include <bsd.port.pre.mk> +.if ${OSVERSION} >= 400000 +BROKEN= "missing sys/rlist.h on 4.0 and later" +.endif do-install: - ${INSTALL_MAN} ${WRKSRC}/asmem.man ${PREFIX}/man/man1/asmem.1 - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} \ - -g kmem -m 2755 ${WRKSRC}/asmem ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/asmem.man ${PREFIX}/man/man1/asmem.1 + ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} \ + -g kmem -m 2755 ${WRKSRC}/asmem ${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/sysutils/asmem/distinfo b/sysutils/asmem/distinfo index 32796d58813f..57a1a7876670 100644 --- a/sysutils/asmem/distinfo +++ b/sysutils/asmem/distinfo @@ -1 +1 @@ -MD5 (asmem-1.5.tar.gz) = 059cb8834917d29999038c2d2e32330b +MD5 (asmem-1.6.tar.gz) = 8c1eafc7af13279f37e622a1e9d5101d diff --git a/sysutils/asmem/files/patch-aa b/sysutils/asmem/files/patch-aa index 9777243f3904..b17c27d77ed8 100644 --- a/sysutils/asmem/files/patch-aa +++ b/sysutils/asmem/files/patch-aa @@ -1,53 +1,35 @@ -*** Makefile.UNIX.orig Sat Mar 6 09:13:53 1999 ---- Makefile.UNIX Fri Jun 4 15:41:11 1999 -*************** -*** 5,11 **** - - # The location and names of the X11 libraries - LDIR = -L/usr/X11R6/lib -! LIBS = -lXpm -lX11 - - # The include path to the X11 files - C_INCLUDE = -I. -I/usr/X11R6/include ---- 5,11 ---- - - # The location and names of the X11 libraries - LDIR = -L/usr/X11R6/lib -! LIBS = -lXpm -lX11 -lkvm - - # The include path to the X11 files - C_INCLUDE = -I. -I/usr/X11R6/include -*************** -*** 17,23 **** - - CFLAGS = $(COPTS) $(COMPILE_FLAGS) $(C_INCLUDE) - -! OBJ = asmem.o asmem_x.o read_mem.o x_color.o safecopy.o - - all: asmem - @echo Ready. ---- 17,23 ---- - - CFLAGS = $(COPTS) $(COMPILE_FLAGS) $(C_INCLUDE) - -! OBJ = asmem.o asmem_x.o kvm_read.o x_color.o safecopy.o - - all: asmem - @echo Ready. -*************** -*** 34,40 **** - x_color.o: x_color.c - $(CC) -c $< $(CFLAGS) -o $@ - -! read_mem.o: read_mem.h read_mem.c state.h - $(CC) -c $< $(CFLAGS) -o $@ - - asmem_x.o: asmem_x.c asmem_x.h x_color.h safecopy.h state.h\ ---- 34,40 ---- - x_color.o: x_color.c - $(CC) -c $< $(CFLAGS) -o $@ - -! kvm_read.o: read_mem.h kvm_read.c state.h - $(CC) -c $< $(CFLAGS) -o $@ - - asmem_x.o: asmem_x.c asmem_x.h x_color.h safecopy.h state.h\ +--- Makefile.UNIX Sat Mar 6 09:13:53 1999 ++++ Makefile.UNIX.new Sun Feb 13 01:23:54 2000 +@@ -5,19 +5,19 @@ + + # The location and names of the X11 libraries + LDIR = -L/usr/X11R6/lib +-LIBS = -lXpm -lX11 ++LIBS = -lXpm -lX11 -lkvm + + # The include path to the X11 files + C_INCLUDE = -I. -I/usr/X11R6/include + + #----------------------------------------------------- +-CC = gcc ++CC ?= gcc + COPTS = -O2 -pipe -Wall -Wshadow + #COMPILE_FLAGS = -DDEBUG -DTEST -g + +-CFLAGS = $(COPTS) $(COMPILE_FLAGS) $(C_INCLUDE) ++CFLAGS = $(PCFLAGS) $(COPTS) $(COMPILE_FLAGS) $(C_INCLUDE) + +-OBJ = asmem.o asmem_x.o read_mem.o x_color.o safecopy.o ++OBJ = asmem.o asmem_x.o kvm_read.o x_color.o safecopy.o + + all: asmem + @echo Ready. +@@ -34,7 +34,7 @@ + x_color.o: x_color.c + $(CC) -c $< $(CFLAGS) -o $@ + +-read_mem.o: read_mem.h read_mem.c state.h ++kvm_read.o: read_mem.h kvm_read.c state.h + $(CC) -c $< $(CFLAGS) -o $@ + + asmem_x.o: asmem_x.c asmem_x.h x_color.h safecopy.h state.h\ diff --git a/sysutils/asmem/files/patch-ac b/sysutils/asmem/files/patch-ac new file mode 100644 index 000000000000..07e7caea4be3 --- /dev/null +++ b/sysutils/asmem/files/patch-ac @@ -0,0 +1,18 @@ +--- asmem.c Thu Dec 16 17:39:59 1999 ++++ asmem.c.new Sun Feb 13 01:22:32 2000 +@@ -168,7 +168,7 @@ + + } + +-void main(int argc, char** argv) ++int main(int argc, char** argv) + { + defaults(); + parsecmdline(argc, argv); +@@ -182,5 +182,6 @@ + asmem_update(); + usleep(X11_INTERVAL); + } ++ return 0; + } + |