Date: Sun, 13 Feb 2000 01:36:06 -0500 (EST) From: Will Andrews <andrews@technologist.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/16692: update port: sysutils/asmem: 1.5 -> 1.6 Message-ID: <20000213063606.0D6511995@argon.blackdawn.com>
next in thread | raw e-mail | index | archive | help
>Number: 16692 >Category: ports >Synopsis: update port: sysutils/asmem: 1.5 -> 1.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 12 22:40:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Will Andrews >Release: FreeBSD 4.0-CURRENT i386 >Organization: none >Environment: FreeBSD argon.blackdawn.com 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Sat Feb 12 13:20:47 EST 2000 root@argon.blackdawn.com:/usr/src/sys/compile/KRYPTON i386 >Description: Fix asmem on -CURRENT. I'm not sure why bento thinks the include is missing, because it's on my (fresh) -current. Also upgrade asmem from 1.5 to 1.6. And clean up the port's Makefile - it looks messy. :-) Also make the damn thing respect CC/CFLAGS. Also stop that stupid main() return warning when compiling. >How-To-Repeat: Use the patch below to fix the current port. >Fix: diff -urN asmem/Makefile asmem.new/Makefile --- asmem/Makefile Sat Dec 25 06:16:32 1999 +++ asmem.new/Makefile Sun Feb 13 01:34:38 2000 @@ -1,11 +1,11 @@ # New ports collection makefile for: asfsm -# Version required: asmem-1.5 -# Date created: 4 June 1999 -# Whom: jack +# Version required: asmem-1.6 +# Date created: 4 June 1999 +# Whom: jack # # $FreeBSD: ports/sysutils/asmem/Makefile,v 1.6 1999/12/25 01:31:26 steve Exp $ -DISTNAME= asmem-1.5 +DISTNAME= asmem-1.6 CATEGORIES= sysutils afterstep MASTER_SITES= ftp://ftp.afterstep.org/apps/asmem/ \ http://www.bewoner.dma.be/Albert/software/ @@ -14,20 +14,13 @@ 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}" 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_PROGRAM} -o ${BINOWN} -g kmem -m 2755 ${WRKSRC}/asmem ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN asmem/files/md5 asmem.new/files/md5 --- asmem/files/md5 Sat Dec 25 06:16:33 1999 +++ asmem.new/files/md5 Sun Feb 13 01:31:01 2000 @@ -1 +1 @@ -MD5 (asmem-1.5.tar.gz) = 059cb8834917d29999038c2d2e32330b +MD5 (asmem-1.6.tar.gz) = 8c1eafc7af13279f37e622a1e9d5101d diff -urN asmem/patches/patch-aa asmem.new/patches/patch-aa --- asmem/patches/patch-aa Mon Jun 14 16:00:36 1999 +++ asmem.new/patches/patch-aa Sun Feb 13 01:24:17 2000 @@ -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 -urN asmem/patches/patch-ac asmem.new/patches/patch-ac --- asmem/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ asmem.new/patches/patch-ac Sun Feb 13 01:22:52 2000 @@ -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; + } + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000213063606.0D6511995>