diff options
| -rw-r--r-- | www/ashe/Makefile | 27 | ||||
| -rw-r--r-- | www/ashe/distinfo | 4 | ||||
| -rw-r--r-- | www/ashe/files/patch-aa | 31 | ||||
| -rw-r--r-- | www/ashe/files/patch-ab | 46 | ||||
| -rw-r--r-- | www/ashe/files/patch-ac | 160 | ||||
| -rw-r--r-- | www/ashe/files/patch-ad | 25 | ||||
| -rw-r--r-- | www/ashe/pkg-descr | 2 | ||||
| -rw-r--r-- | www/ashe/pkg-plist | 2 |
8 files changed, 141 insertions, 156 deletions
diff --git a/www/ashe/Makefile b/www/ashe/Makefile index 932777a25987..a93215749061 100644 --- a/www/ashe/Makefile +++ b/www/ashe/Makefile @@ -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 --git a/www/ashe/distinfo b/www/ashe/distinfo index c9826e9cde51..cf8693e5d5df 100644 --- a/www/ashe/distinfo +++ b/www/ashe/distinfo @@ -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 --git a/www/ashe/files/patch-aa b/www/ashe/files/patch-aa index adcc005b5b9e..e944583607d5 100644 --- a/www/ashe/files/patch-aa +++ b/www/ashe/files/patch-aa @@ -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 --git a/www/ashe/files/patch-ab b/www/ashe/files/patch-ab index 13ec4cc9cd95..29e7e1703583 100644 --- a/www/ashe/files/patch-ab +++ b/www/ashe/files/patch-ab @@ -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 --git a/www/ashe/files/patch-ac b/www/ashe/files/patch-ac index 72be72b9633d..f00185261c97 100644 --- a/www/ashe/files/patch-ac +++ b/www/ashe/files/patch-ac @@ -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 +--- 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) +-/* +- * 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)) - -- #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 - -! ComplexProgramTarget(xhtml) -! InstallNonExecFile(help.html,$(LIBDIR)/xhtml) -! InstallNonExecFile(XHTML.ad,$(XAPPLOADDIR)) +-NormalProgramTarget( $(TARGETS), $(OBJS), $(DEPLIBS), $(LCL_LIB), $(SYS_LIB)) +- +-DependTarget() ++ComplexProgramTarget(xhtml) ++InstallAppDefaults(XHTML) ++InstallNonExecFile(help.html,$(LIBDIR)/xhtml) + + + diff --git a/www/ashe/files/patch-ad b/www/ashe/files/patch-ad index 1fadd0c76bf6..0b6a692dd4af 100644 --- a/www/ashe/files/patch-ad +++ b/www/ashe/files/patch-ad @@ -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 --git a/www/ashe/pkg-descr b/www/ashe/pkg-descr index dff755dda3b5..2e2f3e597b49 100644 --- a/www/ashe/pkg-descr +++ b/www/ashe/pkg-descr @@ -1 +1,3 @@ ASHE - A Simple HTML Editor + +WWW: http://www.cs.rpi.edu/~puninj/TALK/head.html diff --git a/www/ashe/pkg-plist b/www/ashe/pkg-plist index cd7686b95623..733cd0c6c71d 100644 --- a/www/ashe/pkg-plist +++ b/www/ashe/pkg-plist @@ -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 |