Date: Fri, 23 Jun 2000 05:52:06 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19468: Update port: patchkit for using MASTER_SITE_AFTERSTEP Message-ID: <20000623125206.44FA337B9D1@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19468 >Category: ports >Synopsis: Update port: patchkit for using MASTER_SITE_AFTERSTEP >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: Fri Jun 23 06:00:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Use MASTER_SITE_AFTERSTEP to MASTER_SITES >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # misc_asbutton.patch # print_asprint.patch # sysutils_asapm.patch # sysutils_asmon.patch # x11-fm_asfiles.patch # echo x - misc_asbutton.patch sed 's/^X//' >misc_asbutton.patch << 'END-of-misc_asbutton.patch' Xdiff -urN /usr/ports/misc/asbutton/Makefile misc/asbutton/Makefile X--- /usr/ports/misc/asbutton/Makefile Sat Apr 15 00:28:10 2000 X+++ misc/asbutton/Makefile Wed Jun 21 03:29:16 2000 X@@ -8,29 +8,27 @@ X PORTNAME= asbutton X PORTVERSION= 0.3 X CATEGORIES= misc windowmaker afterstep X-MASTER_SITES= http://www.tigr.net/afterstep/as-apps/download/asbutton/ \ X- ftp://ftp.afterstep.org/apps/asbutton/ X+MASTER_SITES= ${MASTER_SITE_AFTERSTEP} X+MASTER_SITE_SUBDIR= apps/asbutton X X MAINTAINER= jim@FreeBSD.org X X LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm X X USE_X_PREFIX= yes X- X-do-build: X- (cd ${WRKSRC} && make) X+ALL_TARGET= asbutton X X do-install: X- @${INSTALL_PROGRAM} ${WRKSRC}/asbutton ${PREFIX}/bin X+ ${INSTALL_PROGRAM} ${WRKSRC}/asbutton ${PREFIX}/bin X @${ECHO} "===> Installing icons in ${PREFIX}/share/asbutton" X @${MKDIR} ${PREFIX}/share/asbutton && ${CHMOD} a+rx ${PREFIX}/share/asbutton X- @${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/share/asbutton X+ ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/share/asbutton X X post-install: X @${ECHO} "===> Installing sample asbuttonrc in ${PREFIX}/share/examples/asbutton" X @${ECHO} "===> Copy to ~/.asbuttonrc and modify to desired config." X @${MKDIR} ${PREFIX}/share/examples/asbutton && ${CHMOD} a+rx ${PREFIX}/share/examples/asbutton X- @${INSTALL_DATA} ${WRKSRC}/.asbuttonrc ${PREFIX}/share/examples/asbutton/asbuttonrc && ${CHMOD} u+rw ${PREFIX}/share/examples/asbutton/asbuttonrc X+ ${INSTALL_DATA} ${WRKSRC}/.asbuttonrc ${PREFIX}/share/examples/asbutton/asbuttonrc && ${CHMOD} u+rw ${PREFIX}/share/examples/asbutton/asbuttonrc X @${ECHO} "===> Use 'asbutton -h' for help." X X .include <bsd.port.mk> Xdiff -urN /usr/ports/misc/asbutton/files/md5 misc/asbutton/files/md5 X--- /usr/ports/misc/asbutton/files/md5 Sun Aug 1 10:59:41 1999 X+++ misc/asbutton/files/md5 Wed Jun 21 03:29:37 2000 X@@ -1 +1 @@ X-MD5 (asbutton-0.3.tar.gz) = febcc9db3eb615856bbebdc966ea4f27 X+MD5 (asbutton-0.3.tar.gz) = bfb9445670946654814333d707e6cb86 Xdiff -urN /usr/ports/misc/asbutton/patches/patch-aa misc/asbutton/patches/patch-aa X--- /usr/ports/misc/asbutton/patches/patch-aa Thu Jan 1 09:00:00 1970 X+++ misc/asbutton/patches/patch-aa Wed Jun 21 02:54:51 2000 X@@ -0,0 +1,33 @@ X+--- Makefile.orig Sat Jul 17 07:16:39 1999 X++++ Makefile Wed Jun 21 02:54:42 2000 X+@@ -1,12 +1,12 @@ X+-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11 -I/usr/X11R6/include X+-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib X++INCLUDES =-I${X11BASE}/include/X11 -I${X11BASE}/include X++LIBINC =-L${X11BASE}/lib X+ LIBS = -lm -lX11 -lXpm -lXext X+ #CCFLAGS = -O6 -mpentiumpro -march=pentiumpro X+-CCFLAGS = -O2 X++CCFLAGS = ${CFLAGS} X+ TARGET = asbutton X+ OBJECTS = asbutton.o readline.o X+-BINDIR = /usr/local/bin X+-ICONDIR = /usr/share/afterstep/desktop/icons/16bpp X++BINDIR = ${PREFIX}/bin X++ICONDIR = ${PREFIX}/share/asbutton X+ X+ ICONS = asb4-1.xpm asb4-2.xpm asb4-3.xpm asb4-4.xpm asb4-blank.xpm asb4-bullethole.xpm \ X+ asb4-filingcabinet.xpm asb4-gear.xpm asb4-gnu-button-thang.xpm \ X+@@ -23,10 +23,10 @@ X+ asb9-corel.xpm asb9-gqview.xpm asb9-vim.xpm asb9-xmms.xpm X+ X+ .c.o: X+- gcc ${CCFLAGS} -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o X++ ${CC} ${CCFLAGS} -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o X+ X+ ${TARGET}: ${OBJECTS} X+- gcc ${CCFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} X++ ${CC} ${CCFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} X+ X+ clean:: X+ for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done END-of-misc_asbutton.patch echo x - print_asprint.patch sed 's/^X//' >print_asprint.patch << 'END-of-print_asprint.patch' Xdiff -urN /usr/ports/print/asprint/Makefile print/asprint/Makefile X--- /usr/ports/print/asprint/Makefile Mon Apr 10 20:59:47 2000 X+++ print/asprint/Makefile Wed Jun 21 02:36:27 2000 X@@ -8,7 +8,8 @@ X PORTNAME= asprint X PORTVERSION= 1.0 X CATEGORIES= print X-MASTER_SITES= ftp://ftp.afterstep.org/apps/asprint/ X+MASTER_SITES= ${MASTER_SITE_AFTERSTEP} X+MASTER_SITE_SUBDIR= apps/asprint X DISTNAME= asprint X X MAINTAINER= brett@peloton.runet.edu Xdiff -urN /usr/ports/print/asprint/patches/patch-aa print/asprint/patches/patch-aa X--- /usr/ports/print/asprint/patches/patch-aa Tue Oct 13 11:48:49 1998 X+++ print/asprint/patches/patch-aa Wed Jun 21 02:59:38 2000 X@@ -1,11 +1,14 @@ X---- makefile.orig Fri Mar 14 04:34:48 1997 X-+++ makefile Mon Oct 12 19:17:11 1998 X-@@ -2,17 +2,18 @@ X+--- makefile.orig Fri Mar 14 19:34:48 1997 X++++ makefile Wed Jun 21 02:59:31 2000 X+@@ -1,18 +1,19 @@ X+ .KEEP_STATE: X X- CFLAGS = -O2 X- CC = gcc X+-CFLAGS = -O2 X+-CC = gcc X -XLIB = -L/usr/X11/lib -lXaw3d -lXmu -lXt X - X++CFLAGS ?= -O2 X++CC ?= gcc X +XLIB = -L$(X11BASE)/lib -lXaw -lXmu -lXt X +.if $(PORTOBJFORMAT) == "elf" X +XLIB+= -Wl,-rpath,$(X11BASE)/lib END-of-print_asprint.patch echo x - sysutils_asapm.patch sed 's/^X//' >sysutils_asapm.patch << 'END-of-sysutils_asapm.patch' Xdiff -urN /usr/ports/sysutils/asapm/Makefile sysutils/asapm/Makefile X--- /usr/ports/sysutils/asapm/Makefile Mon Apr 24 19:03:09 2000 X+++ sysutils/asapm/Makefile Wed Jun 21 03:30:37 2000 X@@ -8,8 +8,8 @@ X PORTNAME= asapm X PORTVERSION= 2.7 X CATEGORIES= sysutils X-MASTER_SITES= ftp://ftp.afterstep.org/apps/asapm/ \ X- http://www.tigr.net/afterstep/as-apps/download/asapm/ X+MASTER_SITES= ${MASTER_SITE_AFTERSTEP} X+MASTER_SITE_SUBDIR= apps/asapm X X MAINTAINER= handy@physics.montana.edu X X@@ -22,7 +22,5 @@ X INSTALL_TARGET= install install.man X X MAN1= asapm.1 X- X-FETCH_BEFORE_ARGS= -b X X .include <bsd.port.mk> END-of-sysutils_asapm.patch echo x - sysutils_asmon.patch sed 's/^X//' >sysutils_asmon.patch << 'END-of-sysutils_asmon.patch' Xdiff -urN /usr/ports/sysutils/asmon/Makefile sysutils/asmon/Makefile X--- /usr/ports/sysutils/asmon/Makefile Mon Apr 24 19:03:12 2000 X+++ sysutils/asmon/Makefile Wed Jun 21 03:51:11 2000 X@@ -1,4 +1,4 @@ X-# New ports collection makefile for: asfsm X+# New ports collection makefile for: asmon X # Date created: 27 Sep 1999 X # Whom: jack X # X@@ -8,8 +8,8 @@ X PORTNAME= asmon X PORTVERSION= 0.60 X CATEGORIES= sysutils afterstep X-MASTER_SITES= ftp://ftp.afterstep.org/apps/asmon/ \ X- http://www.tigr.net/afterstep/as-apps/download/asmon/ X+MASTER_SITES= ${MASTER_SITE_AFTERSTEP} X+MASTER_SITE_SUBDIR= apps/asmon X X MAINTAINER= jack@germanium.xtalwind.net X Xdiff -urN /usr/ports/sysutils/asmon/files/md5 sysutils/asmon/files/md5 X--- /usr/ports/sysutils/asmon/files/md5 Tue Feb 8 06:18:58 2000 X+++ sysutils/asmon/files/md5 Wed Jun 21 03:50:58 2000 X@@ -1,2 +1 @@ X-MD5 (asmon-0.60.tar.gz) = d33e59597f56368f180ca1b4b4c126e8 X MD5 (asmon-0.60.tar.gz) = 781d273283b307b5089afbfa6aa35f18 Xdiff -urN /usr/ports/sysutils/asmon/patches/patch-aa sysutils/asmon/patches/patch-aa X--- /usr/ports/sysutils/asmon/patches/patch-aa Wed Oct 6 01:30:00 1999 X+++ sysutils/asmon/patches/patch-aa Wed Jun 21 03:53:59 2000 X@@ -3,7 +3,7 @@ X *************** X *** 0 **** X --- 1,20 ---- X-+ LIBDIR = -L/usr/X11R6/lib X++ LIBDIR = -L${X11BASE}/lib X + LIBS = -lXpm -lXext -lX11 -lkvm X + OBJS = asmon/asmon.o \ X + wmgeneral/wmgeneral.o \ X@@ -13,10 +13,10 @@ X + all: asmon X + X + .c.o: X-+ cc -c -Wall -I/usr/X11R6/include $< -o $*.o X++ $(CC) $(CFLAGS) -c -Wall -I${X11BASE}/include $< -o $*.o X + X + asmon: $(OBJS) X-+ cc -o asmon/asmon $^ $(LIBDIR) $(LIBS) X++ $(CC) -o asmon/asmon $^ $(LIBDIR) $(LIBS) X + X + clean:: X + for i in $(OBJS) ; do \ END-of-sysutils_asmon.patch echo x - x11-fm_asfiles.patch sed 's/^X//' >x11-fm_asfiles.patch << 'END-of-x11-fm_asfiles.patch' Xdiff -urN /usr/ports/x11-fm/asfiles/Makefile x11-fm/asfiles/Makefile X--- /usr/ports/x11-fm/asfiles/Makefile Mon Apr 10 21:06:35 2000 X+++ x11-fm/asfiles/Makefile Tue Jun 20 07:18:55 2000 X@@ -7,9 +7,9 @@ X X PORTNAME= asfiles X PORTVERSION= 1.0 X-CATEGORIES= x11-fm windowmaker X-MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/apps/ASFiles/ \ X- ftp://ftp.uni-trier.de/pub/unix/X11/window-manager/AfterStep/apps/ASFiles/ X+CATEGORIES= x11-fm afterstep windowmaker X+MASTER_SITES= ${MASTER_SITE_AFTERSTEP} X+MASTER_SITE_SUBDIR= apps/ASFiles X DISTNAME= ASFiles-${PORTVERSION} X X MAINTAINER= lukin@okbmei.msk.su Xdiff -urN /usr/ports/x11-fm/asfiles/files/md5 x11-fm/asfiles/files/md5 X--- /usr/ports/x11-fm/asfiles/files/md5 Thu Oct 30 10:44:49 1997 X+++ x11-fm/asfiles/files/md5 Wed Jun 21 03:37:35 2000 X@@ -1 +1 @@ X-MD5 (ASFiles-1.0.tar.gz) = 1e38eb7b37e1e53de7711cd410e66ef8 X+MD5 (ASFiles-1.0.tar.gz) = cd385e5bd93a75cb110c7544f86cc303 END-of-x11-fm_asfiles.patch exit >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?20000623125206.44FA337B9D1>