From 10682a510ae364f5c78c1ba5c06ebeebdf28a315 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Fri, 10 Dec 1999 19:40:46 +0000 Subject: One of the distfiles changed contents, but not name. The changed distfile is for a newer version of the primary distfile. Thus that needed to be updated. And that caused others to need to be updated. Anyway after the upgrades, it doesn't build fully, but is farther along to where it needs to be. Since this isn't really any more broken than before, commit it to help others that want to see this working again. --- devel/codecrusader/Makefile | 20 +++++++------- devel/codecrusader/distinfo | 12 ++++----- devel/codecrusader/files/patch-ac | 57 +++++++++++++++++++-------------------- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/devel/codecrusader/Makefile b/devel/codecrusader/Makefile index 917f9657e52b..cd7d03c8fa20 100644 --- a/devel/codecrusader/Makefile +++ b/devel/codecrusader/Makefile @@ -6,23 +6,23 @@ # $FreeBSD$ # -DISTNAME= CodeCrusader-2.1.3 -PKGNAME= code_crusader-2.1.3 +DISTNAME= code_crusader_source-2.1.4 +PKGNAME= code_crusader-2.1.4 CATEGORIES= devel MASTER_SITES= ftp://ftp.its.caltech.edu/pub/jafl/programs/jcc/source/ \ - ftp://ftp.its.caltech.edu/pub/jafl/jx/source-1.5.2/ -DISTFILES= code_crusader_source-2.1.3.tar.gz \ - JTree_source-1.1.5.tar.gz \ - JX_source-1.5.2.tar.gz \ - JToolBar_source-0.5.3.tar.gz + ftp://ftp.its.caltech.edu/pub/jafl/jx/source-1.5.3/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + JTree_source-1.1.7.tar.gz \ + JX_source-1.5.3.tar.gz \ + JToolBar_source-0.5.4.tar.gz MAINTAINER= davec@unforgettable.com -BROKEN= 'installs files during build' +#BROKEN= 'installs files during build' LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -WRKSRC= ${WRKDIR}/JX-1.5.2 +WRKSRC= ${WRKDIR}/JX-1.5.3 USE_XLIB= yes PLIST_SUB+= "LIBACE=${LIBACE}" \ @@ -48,7 +48,7 @@ pre-fetch: @ ${ECHO_MSG} MASTER_SITES+= ftp://ftp.cco.caltech.edu/pub/glenn/Medic/source/ \ ftp://ftp.cco.caltech.edu/pub/glenn/Arrow/source/ -DISTFILES+= Code_Medic_source-1.0.3.tar.gz \ +DISTFILES+= Code_Medic_source-1.0.5.tar.gz \ JSearch_source-0.5.6.tar.gz .endif diff --git a/devel/codecrusader/distinfo b/devel/codecrusader/distinfo index 557b0533ee57..864140b1f318 100644 --- a/devel/codecrusader/distinfo +++ b/devel/codecrusader/distinfo @@ -1,6 +1,6 @@ -MD5 (code_crusader_source-2.1.3.tar.gz) = 14e9ed8895e19855b94b371d0e835cf9 -MD5 (JTree_source-1.1.5.tar.gz) = b144fd6b9b29ab564f3156ab58bac951 -MD5 (JX_source-1.5.2.tar.gz) = b41be047d3d83cf5cd3b534f0b96ebda -MD5 (JToolBar_source-0.5.3.tar.gz) = 9e43ddde396b1c23b21c24f84bf0faf6 -MD5 (Code_Medic_source-1.0.3.tar.gz) = be96f49099ce00e3a5aeda6e907a0df4 -MD5 (JSearch_source-0.5.6.tar.gz) = b76d0fd94634da71a6a0e5b72609a53b +MD5 (code_crusader_source-2.1.4.tar.gz) = 4c942fdf1f7019e83939f45cf2b4b7a8 +MD5 (JTree_source-1.1.7.tar.gz) = 79749772c85d3234409d8a4bcac2ffd5 +MD5 (JX_source-1.5.3.tar.gz) = e35ea2a77c777d96c3d9b566254d2562 +MD5 (JToolBar_source-0.5.4.tar.gz) = 254e778a3078a1479fab4b44ea0c964b +MD5 (Code_Medic_source-1.0.5.tar.gz) = a8817158c6b679c9e64c021e27878228 +MD5 (JSearch_source-0.5.6.tar.gz) = b639b7173fe50dab0d17b88fd1d6a472 diff --git a/devel/codecrusader/files/patch-ac b/devel/codecrusader/files/patch-ac index 6ba4beb7793b..6cdf361987e8 100644 --- a/devel/codecrusader/files/patch-ac +++ b/devel/codecrusader/files/patch-ac @@ -1,6 +1,6 @@ ---- programs/code_crusader/Make.header.orig Mon Aug 2 06:01:38 1999 -+++ programs/code_crusader/Make.header Mon Aug 2 06:35:46 1999 -@@ -75,11 +75,10 @@ +--- programs/code_crusader/Make.header.orig Tue Sep 21 13:23:17 1999 ++++ programs/code_crusader/Make.header Fri Dec 10 11:31:35 1999 +@@ -73,11 +73,10 @@ ##### .PHONY : default @@ -13,7 +13,19 @@ # # required libraries -@@ -97,21 +96,15 @@ +@@ -98,33 +97,19 @@ + @cd ${JTOOLBARLIBDIR}; ${MAKE} TOUCHSTRING=${TOUCHSTRING} touch + + # +-# ctags +-# +- +-.PHONY : ctags +-ctags: +- @cd ctags; ${MAKE}; strip ctags +- +-# + # install binaries # .PHONY : jxinstall @@ -38,7 +50,7 @@ # # remove binaries -@@ -119,7 +112,6 @@ +@@ -132,7 +117,6 @@ .PHONY : tidy tidy:: @@ -46,24 +58,24 @@ # makemake's clean invokes tidy, which does everything necessary -@@ -132,14 +124,13 @@ +@@ -145,14 +129,13 @@ .PHONY : source source: -- @cd ctags; ${MAKE} clean > /dev/null +- @-cd ctags; ${MAKE} clean > /dev/null @cd ${J_DISTR_TAR_DIR}; \ - tar -czf ${SRC_TAR_FILE} ${filter-out %.o %~ %ctags, \ + tar -czf ${SRC_TAR_FILE} ${filter-out %.o %~, \ ${shell cd ${J_DISTR_TAR_DIR}; echo \ ${addprefix ${SRC_FILE_DIR}/, \ README.* LICENSE FAQ Make.* *.fd \ - ${EXTRA_FILES} macros/* \ + ${EXTRA_FILES} macros/* desktop/* \ - code/* rpm/* ctags/* } }} + code/* rpm/* } }} # # binary distributions -@@ -166,10 +157,10 @@ +@@ -179,18 +162,15 @@ # distr_sub (JCC_DISTR_TAR_FILE, MKMK_TARGET) .PHONY : distr_sub @@ -72,30 +84,15 @@ @strip jcc @${RM} -r ${JCC} - @mkdir ${JCC} ${JCC}/ctags -+ @mkdir ${JCC} - ifdef RH_ISV - @echo '***** RedHat ISV version *****' - @ln -s ../README.ISV ${JCC}/README -@@ -178,10 +169,7 @@ - endif - @ln -s ../jcc ${JCC}/jcc - @ln -s ../macros ${JCC}/macros -- @ln -s ../../ctags/ctags ${JCC}/ctags/ctags ++ @mkdir ${JCC} + @ln -s ../README.binary ${JCC}/README + @ln -s ../jcc ${JCC}/jcc + @ln -s ../macros ${JCC}/macros + @ln -s ../desktop ${JCC}/desktop +- @ln -s ../../ctags/ctags ${JCC}/ctags/ctags @cp LICENSE FAQ ${EXTRA_FILES} ${JCC}/ - @cp ctags/COPYING ctags/FAQ ctags/NEWS ctags/QUOTES ctags/README \ - ctags/ctags.1 ${JCC}/ctags/ @cd ${MKMKDIR}; \ ${MAKE} JCC_TAR_DIR=${JCC_TAR_DIR}/${JCC} ${MKMK_TARGET} @tar -chf ${JCC_DISTR_TAR_FILE} ${JCC}/* -@@ -239,11 +227,3 @@ - beta: debug - @strip -g jcc - @cp jcc ${HOME}/local/stable/jcc_latest -- --# --# ctags --# -- --.PHONY : ctags --ctags: -- @cd ctags; ${MAKE}; strip ctags -- cgit v1.3