Date: Mon, 13 Nov 2000 04:14:40 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22815: Update port: www/ashe to 1.3 Message-ID: <20001113121440.706C037B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22815 >Category: ports >Synopsis: Update port: www/ashe to 1.3 >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: Mon Nov 13 04:20:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.3 Remove file: files/Makefile scripts/configure >How-To-Repeat: >Fix: diff -urN /usr/ports/www/ashe/Makefile www/ashe/Makefile --- /usr/ports/www/ashe/Makefile Wed Nov 8 21:46:39 2000 +++ www/ashe/Makefile Sun Nov 12 19:12:50 2000 @@ -6,20 +6,29 @@ # PORTNAME= ashe -PORTVERSION= 1.1.2 +PORTVERSION= 1.3 CATEGORIES= www -MASTER_SITES= ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \ - ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libcci/ \ - ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libhtmlw/ -DISTFILES= ashe_cci.tar.Z cci.tar.Z libhtmlw.tar.Z +MASTER_SITES= ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.3/%SUBDIR%/ +MASTER_SITE_SUBDIR= src libcci libhtmlw-2.7 +DISTFILES= xhtml-1.3.tar.Z cci.tar.Z libhtmlw.tar.Z MAINTAINER= ports@FreeBSD.org -MAN1= xhtml.1 -MANCOMPRESSED= yes +NO_WRKSUBDIR= yes +CONFIGURE_WRKSRC= ${WRKDIR}/src +INSTALL_WRKSRC= ${WRKDIR}/src USE_MOTIF= yes -NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_IMAKE= yes +MAN1= xhtml.1 + +post-patch: + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad + +do-build: +.for dir in libhtmlw-2.7b3 libcci src + @(cd ${WRKDIR}/${dir}; ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +.endfor .include <bsd.port.mk> diff -urN /usr/ports/www/ashe/distinfo www/ashe/distinfo --- /usr/ports/www/ashe/distinfo Tue Oct 31 02:29:07 1995 +++ www/ashe/distinfo Sun Nov 12 19:06:37 2000 @@ -1,3 +1,3 @@ -MD5 (ashe_cci.tar.Z) = 0122f26238529ccc005d71fba4fae804 +MD5 (xhtml-1.3.tar.Z) = dda13c7538de3b4a3b8f4f67da214ece MD5 (cci.tar.Z) = 66b1eae2dcb452d1215e4d8e5fa46358 -MD5 (libhtmlw.tar.Z) = 68a7e78304db7b575d1219f4f2ec9135 +MD5 (libhtmlw.tar.Z) = acf2ae84aa18a7973c84ce5609a04779 diff -urN /usr/ports/www/ashe/files/Makefile www/ashe/files/Makefile --- /usr/ports/www/ashe/files/Makefile Thu Apr 11 17:59:57 1996 +++ www/ashe/files/Makefile Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -configure: - (cd src; xmkmf -a) - -depend: - (cd src; make depend) - -all: - (cd libhtmlw-src ; make) - (cd libcci ; make) - (cd src ; make) - -install: - (cd src ; make install install.man) diff -urN /usr/ports/www/ashe/files/patch-aa www/ashe/files/patch-aa --- /usr/ports/www/ashe/files/patch-aa Thu Apr 11 18:00:00 1996 +++ www/ashe/files/patch-aa Sun Nov 12 16:41:00 2000 @@ -1,19 +1,12 @@ -*** libhtmlw-src/Makefile.orig Tue Oct 17 10:17:29 1995 ---- libhtmlw-src/Makefile Tue Oct 17 10:18:35 1995 -*************** -*** 1,9 **** - LIBTARGET = libhtmlw.a -! -! INCLUDES = -I/usr/include/X11 -! -! CC=gcc -g $(INCLUDES) -! - RANLIB=ranlib - - all: $(LIBTARGET) ---- 1,5 ---- - LIBTARGET = libhtmlw.a -! CFLAGS+=-I${X11BASE}/include -DMOTIF1_2 - RANLIB=ranlib - - all: $(LIBTARGET) +--- libhtmlw-2.7b3/Makefile.orig Tue May 21 05:35:51 1996 ++++ libhtmlw-2.7b3/Makefile Sun Nov 12 16:38:55 2000 +@@ -1,8 +1,6 @@ + LIBTARGET = libhtmlw.a + +-INCLUDES = -I/usr/include/X11 +- +-CC=gcc -g $(INCLUDES) ++CFLAGS += -I${X11BASE}/include -DMOTIF1_2 + + RANLIB=ranlib + diff -urN /usr/ports/www/ashe/files/patch-ab www/ashe/files/patch-ab --- /usr/ports/www/ashe/files/patch-ab Tue Oct 31 02:29:07 1995 +++ www/ashe/files/patch-ab Sun Nov 12 18:01:16 2000 @@ -1,27 +1,19 @@ -*** libcci/Makefile.orig Tue Oct 17 10:23:25 1995 ---- libcci/Makefile Tue Oct 17 10:23:57 1995 -*************** -*** 1,12 **** -! CFLAGS=-DDEBUG - -! RANLIB = /bin/ranlib -! #RANLIB = /usr/bin/ranlib # the location of ranlib is system dependent. - - SRC = connect.c cciClient.c list.c support.c - OBJ = connect.o cciClient.o list.o support.o -! CC = gcc -! CFLAGS = -ggdb - libcci.a: $(OBJ) - rm -f $@ - ar q $@ $(OBJ) ---- 1,10 ---- -! CFLAGS+=-DDEBUG - -! RANLIB = ranlib - - SRC = connect.c cciClient.c list.c support.c - OBJ = connect.o cciClient.o list.o support.o -! - libcci.a: $(OBJ) - rm -f $@ - ar q $@ $(OBJ) +--- libcci/Makefile.orig Thu Apr 6 21:07:46 1995 ++++ libcci/Makefile Sun Nov 12 18:01:00 2000 +@@ -1,12 +1,10 @@ +-CFLAGS=-DDEBUG +- +-RANLIB = /bin/ranlib +-#RANLIB = /usr/bin/ranlib # the location of ranlib is system dependent. ++RANLIB = ranlib + + SRC = connect.c cciClient.c list.c support.c + OBJ = connect.o cciClient.o list.o support.o +-CC = gcc +-CFLAGS = -ggdb ++ ++all: libcci.a ++ + libcci.a: $(OBJ) + rm -f $@ + ar q $@ $(OBJ) diff -urN /usr/ports/www/ashe/files/patch-ac www/ashe/files/patch-ac --- /usr/ports/www/ashe/files/patch-ac Thu Apr 11 18:00:03 1996 +++ www/ashe/files/patch-ac Sun Nov 12 17:32:23 2000 @@ -1,86 +1,78 @@ -*** src/Imakefile Tue Oct 17 10:26:22 1995 ---- src/Imakefile Tue Oct 17 10:48:34 1995 -*************** -*** 36,96 **** - /* The object files that will be generated */ - OBJS = $(SRCS:.c=.o) - -- /* -- * Specify this line if you want the program to be compiled with Debugging. * -- * -- */ -- -- CDEBUGFLAGS = -g -Wall -- -- CC = gcc -- -- /* -- * Change the name of the compiler here. The default version is -- * 'gcc'. (the Motif libraries needed to be built with it.) -- * If you are changing the compiler to 'cc', you may also need to -- * redefine the EXTRA_LOAD_FLAGS envariable -- * -- * Uncomment this section if GCC is not the compiler. -- * -- * CC=gcc -- * -- * EXTRA_LOAD_FLAGS= -- * -- */ -- -- /* -- * This section tells it which Client library to use. -- * Use 'XawClientLibs' and 'XawClientDepLibs' for the Athena Widget set. -- * Use 'XmClientLibs' and 'XmClientDepLibs' for the Motif widget set. -- * LCL_LIB = XawClientLibs -- * DEPLIBS = XawClientDepLibs -- */ -- -- - /* - * This is the Directory of the HTML Widget Library. (Please change it) - * and CCI library - */ -! LCL_LIB = -L/fs5/grads12/puninj/HTML/libhtmlw \ -! -L/fs5/grads12/puninj/HTML/CCI/libcci - /* - * This is the Directory of the HTML Widget Include Files (Please change it) - * and CCI library - */ -! INCLUDES = -I/fs5/grads12/puninj/HTML/libhtmlw \ -! -I/fs5/grads12/puninj/HTML/CCI/libcci - -- -- #EXTRA_LIBRARIES = -lcci -lhtmlw -lXm -lXt -lXext -lX11 -- EXTRA_LIBRARIES = -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11 - -! # -! # This is what is built when you say 'make all' -! AllTarget($(TARGETS)) -! -! NormalProgramTarget( $(TARGETS), $(OBJS), $(DEPLIBS), $(LCL_LIB), $(SYS_LIB)) -! -! DependTarget() -! -! ---- 36,55 ---- - /* The object files that will be generated */ - OBJS = $(SRCS:.c=.o) - - /* - * This is the Directory of the HTML Widget Library. (Please change it) - * and CCI library - */ -! LOCAL_LDFLAGS = -L../libhtmlw-src -L../libcci -! - /* - * This is the Directory of the HTML Widget Include Files (Please change it) - * and CCI library - */ -! INCLUDES = -I../libhtmlw-src -I../libcci - -+ EXTRA_LIBRARIES = -lcci -lhtmlw ${MOTIFLIB} XawClientLibs +--- src/Imakefile.orig Wed Feb 28 13:19:10 1996 ++++ src/Imakefile Sun Nov 12 17:30:04 2000 +@@ -41,67 +41,30 @@ + /* The object files that will be generated */ + OBJS = $(SRCS:.c=.o) -! ComplexProgramTarget(xhtml) -! InstallNonExecFile(help.html,$(LIBDIR)/xhtml) -! InstallNonExecFile(XHTML.ad,$(XAPPLOADDIR)) +-/* +- * Specify this line if you want the program to be compiled with Debugging. * +- * +- */ +- +-CDEBUGFLAGS = -g -Wall +- +-CC = gcc +- +-/* +- * Change the name of the compiler here. The default version is +- * 'gcc'. (the Motif libraries needed to be built with it.) +- * If you are changing the compiler to 'cc', you may also need to +- * redefine the EXTRA_LOAD_FLAGS envariable +- * +- * Uncomment this section if GCC is not the compiler. +- * +- * CC=gcc +- * +- * EXTRA_LOAD_FLAGS= +- * +- */ +- +-/* +- * This section tells it which Client library to use. +- * Use 'XawClientLibs' and 'XawClientDepLibs' for the Athena Widget set. +- * Use 'XmClientLibs' and 'XmClientDepLibs' for the Motif widget set. +- * LCL_LIB = XawClientLibs +- * DEPLIBS = XawClientDepLibs +- */ +- +- + /* + * This is the Directory of the HTML Widget Library. (Please change it) + * + */ +-LCL_LIB = -L/fs5/grads12/puninj/HTML/libhtmlw-2.7b3 \ +- -L/fs5/grads12/puninj/HTML/CCI/libcci ++LCL_LIB = -L../libhtmlw-2.7b3 \ ++ -L../libcci + + + /* + * This is the Directory of the HTML Widget Include Files (Please change it) + * + */ +-INCLUDES = -I/fs5/grads12/puninj/HTML/libhtmlw-2.7b3 \ +- -I/fs5/grads12/puninj/HTML/CCI/libcci ++INCLUDES = -I../libhtmlw-2.7b3 \ ++ -I../libcci + + + # These libraries are necessary for Solaris : + # -lsocket -lresolv -L/usr/ucblib -lucb -lnsl + +-EXTRA_LIBRARIES = -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11 -lXpm -lm +- ++EXTRA_LIBRARIES = $(LCL_LIB) -lcci -lhtmlw ${MOTIFLIB} XawClientLibs + +-# +-# This is what is built when you say 'make all' +-AllTarget($(TARGETS)) +- +-NormalProgramTarget( $(TARGETS), $(OBJS), $(DEPLIBS), $(LCL_LIB), $(SYS_LIB)) +- +-DependTarget() ++ComplexProgramTarget(xhtml) ++InstallAppDefaults(XHTML) ++InstallNonExecFile(help.html,$(LIBDIR)/xhtml) + + + diff -urN /usr/ports/www/ashe/files/patch-ad www/ashe/files/patch-ad --- /usr/ports/www/ashe/files/patch-ad Thu Apr 11 18:00:05 1996 +++ www/ashe/files/patch-ad Sun Nov 12 16:30:38 2000 @@ -1,14 +1,11 @@ -*** src/XHTML.ad Tue Sep 26 21:43:11 1995 ---- src/XHTML.ad Tue Oct 17 10:50:53 1995 -*************** -*** 27,31 **** - - ! Very Important : Change this directory to the directory of help.html - -! xhtml*htmldir: /fs5/grads12/puninj/HTML/src -! ---- 27,30 ---- - - ! Very Important : Change this directory to the directory of help.html - -! xhtml*htmldir: ${X11BASE}/lib/X11/xhtml +--- src/XHTML.ad.orig Sun Dec 10 02:27:37 1995 ++++ src/XHTML.ad Sun Nov 12 16:30:23 2000 +@@ -38,7 +38,7 @@ + + ! Very Important : Change this directory to the directory of help.html + +-xhtml*htmldir: /students/grads12/puninj/HTML/src ++xhtml*htmldir: %%PREFIX%%/lib/X11/xhtml + + xhtml*graph_frame.width: 600 + xhtml*graph_frame.height: 600 diff -urN /usr/ports/www/ashe/pkg-descr www/ashe/pkg-descr --- /usr/ports/www/ashe/pkg-descr Tue Oct 31 02:29:08 1995 +++ www/ashe/pkg-descr Sun Nov 12 16:19:34 2000 @@ -1 +1,3 @@ ASHE - A Simple HTML Editor + +WWW: http://www.cs.rpi.edu/~puninj/TALK/head.html diff -urN /usr/ports/www/ashe/pkg-plist www/ashe/pkg-plist --- /usr/ports/www/ashe/pkg-plist Wed Sep 27 16:14:42 2000 +++ www/ashe/pkg-plist Sun Nov 12 17:24:09 2000 @@ -1,4 +1,4 @@ bin/xhtml lib/X11/xhtml/help.html -lib/X11/app-defaults/XHTML.ad +lib/X11/app-defaults/XHTML @dirrm lib/X11/xhtml diff -urN /usr/ports/www/ashe/scripts/configure www/ashe/scripts/configure --- /usr/ports/www/ashe/scripts/configure Tue Oct 31 02:29:08 1995 +++ www/ashe/scripts/configure Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ -#!/bin/sh - -cp ${FILESDIR}/Makefile ${WRKSRC} - -cd ${WRKSRC}/src - -mv -f XHTML.ad XHTML.ad.orig -sed -e "s#@@prefix@@#${X11BASE}#" XHTML.ad.orig >XHTML.ad - -xmkmf >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?20001113121440.706C037B4C5>