diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2005-08-28 12:56:29 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-08-28 12:56:29 +0000 |
commit | ce25734f0601771659ebe921ef53d2745726a3c9 (patch) | |
tree | 9ff9e4cab0764b5a4f3b14ba5c2492b481cdfbde /editors | |
parent | Fix build on 4.x (diff) |
Upgrade to 2000.11.
Notes
Notes:
svn path=/head/; revision=141109
Diffstat (limited to 'editors')
-rw-r--r-- | editors/mined/Makefile | 21 | ||||
-rw-r--r-- | editors/mined/distinfo | 4 | ||||
-rw-r--r-- | editors/mined/files/patch-makemined | 11 | ||||
-rw-r--r-- | editors/mined/files/patch-src::makefile.bsd | 36 | ||||
-rw-r--r-- | editors/mined/files/patch-src::mkinclud.mak | 28 | ||||
-rw-r--r-- | editors/mined/pkg-plist | 45 |
6 files changed, 73 insertions, 72 deletions
diff --git a/editors/mined/Makefile b/editors/mined/Makefile index 136a2549a12e..ed0839a9c963 100644 --- a/editors/mined/Makefile +++ b/editors/mined/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mined -PORTVERSION= 2000.10 +PORTVERSION= 2000.11 CATEGORIES= editors MASTER_SITES= http://towo.net/mined/ @@ -18,15 +18,7 @@ MAKEFILE= makefile .if defined(NOPORTDOCS) ALL_TARGET= mined manual .else -PORTDOCS= cancel.html changes.html combined.png combining.png contact.html \ - design.html dollar.gif donate.html download.html euro1.gif features.html\ - handr.gif haninfo-big5.png haninfo-menu.png haninfo-utf8.png header.html\ - index-dl.html index.html logo.gif menu.png mined-html.png mined-uni.png \ - mined.html mnemodoc.html navigate.html new-rot.gif new.gif overview.html\ - paypal_donate.gif paypal_logo.gif paypal_payments.gif picklist.png \ - script-arabic.gif script-cyrillic.gif script-greek.gif script-han.gif \ - script-hebrew.gif script-highlighting.png script-hiragana.gif \ - script-thai.gif separated.png thankyou.html unicode.html +PORTDOCS= * .endif USE_GMAKE= YES @@ -36,9 +28,9 @@ INSTALL_TARGET= localinstall MAN1= mined.1 pre-build: - @${MV} ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.cc.bak - @${CP} ${WRKSRC}/src/mkinclud.gcc ${WRKSRC}/src/mkinclud.cc - @(if [ ! -f ${WRKSRC}/src/mkinclud.${CC:T} ] ; then \ + ${MV} ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.cc.bak + ${CP} ${WRKSRC}/src/mkinclud.gcc ${WRKSRC}/src/mkinclud.cc + (if [ ! -f ${WRKSRC}/src/mkinclud.${CC:T} ] ; then \ ${LN} -sf ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.${CC:T} ; \ fi) @${ECHO_MSG} @@ -46,9 +38,10 @@ pre-build: @${ECHO_MSG} post-install: + @${RM} ${DATADIR}/LICENSE.GNU ${DATADIR}/*.bat .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/editors/mined/distinfo b/editors/mined/distinfo index a1a59d8f769b..0afdd1c09eb9 100644 --- a/editors/mined/distinfo +++ b/editors/mined/distinfo @@ -1,2 +1,2 @@ -MD5 (mined-2000.10.tar.gz) = 8fe8543bb19dc8272187e257df4eb5f3 -SIZE (mined-2000.10.tar.gz) = 3116435 +MD5 (mined-2000.11.tar.gz) = 1b257db17852ab189eb08a960b948bad +SIZE (mined-2000.11.tar.gz) = 3218977 diff --git a/editors/mined/files/patch-makemined b/editors/mined/files/patch-makemined deleted file mode 100644 index da41bbe6c11c..000000000000 --- a/editors/mined/files/patch-makemined +++ /dev/null @@ -1,11 +0,0 @@ ---- makemined.orig Wed Dec 8 11:19:18 2004 -+++ makemined Sat Feb 5 17:59:45 2005 -@@ -34,7 +34,7 @@ - else make -f makefile.gcc $1 - fi;; - HP*) make -f makefile.hp $1;; --*BSD*) gmake -f makefile.bsd $1;; -+*BSD*) ${GMAKE} -f makefile.bsd $1;; - CYG*) INSTALLTARGET=installcygwin make -f makefile.cygwin $1;; - Darwin*) - if type gcc > /dev/null 2> /dev/null diff --git a/editors/mined/files/patch-src::makefile.bsd b/editors/mined/files/patch-src::makefile.bsd index 5fb52d7b746b..b8abf4797c1b 100644 --- a/editors/mined/files/patch-src::makefile.bsd +++ b/editors/mined/files/patch-src::makefile.bsd @@ -1,24 +1,24 @@ ---- ./src/makefile.bsd.orig Sun Oct 31 07:34:57 2004 -+++ ./src/makefile.bsd Sat Feb 5 18:04:40 2005 -@@ -16,7 +16,7 @@ - # directories for target "make localinstall" - lprefix = $(root)/usr/local - lbindir = $(lprefix)/bin --lhlpdir = $(lprefix)/share/mined -+lhlpdir = $(lprefix)/share/doc/mined/help +--- src/makefile.bsd.orig Thu Apr 28 00:00:00 2005 ++++ src/makefile.bsd Wed Aug 3 18:50:24 2005 +@@ -20,7 +20,7 @@ + mandir = $(prefix)/share/man + rundir = $(prefix)/share/mined + # FreeBSD: +-#docdir = $(lprefix)/share/doc/mined ++docdir = $(lprefix)/share/doc/mined + # NetBSD (few packages), OpenBSD: + #docdir = $(lprefix)/share/doc/html/mined + +@@ -30,7 +30,7 @@ lmandir = $(lprefix)/man + lrundir = $(lprefix)/share/mined + # FreeBSD, OpenBSD: +-#ldocdir = $(lprefix)/share/doc/mined ++ldocdir = $(lprefix)/share/doc/mined INSTALL = install -@@ -87,7 +87,7 @@ - # link options - - # link dynamically --LDOPTS=-d y # -d n links statically -+LDOPTS= # -d n links statically - GLDOPTS= # -static links statically - - -@@ -95,7 +95,7 @@ + #INSTALL = /bin/cp -p +@@ -108,7 +108,7 @@ # compiler selection and compiler-specific options # (source warnings, optimisation and debug) diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src::mkinclud.mak index 0f2782ab9d9d..abb707a017e3 100644 --- a/editors/mined/files/patch-src::mkinclud.mak +++ b/editors/mined/files/patch-src::mkinclud.mak @@ -1,8 +1,26 @@ ---- ./src/mkinclud.mak.orig Tue Feb 8 11:19:14 2005 -+++ ./src/mkinclud.mak Thu Feb 10 19:47:33 2005 -@@ -307,8 +307,7 @@ - mkdir -p $(lhlpdir) - $(INSTALL) ../usrshare/* $(lhlpdir) +--- src/mkinclud.mak.orig Thu Jun 23 00:00:00 2005 ++++ src/mkinclud.mak Wed Aug 3 18:25:22 2005 +@@ -226,7 +226,7 @@ + # generate makefile to deal with variable list of targets, + # invoke it to generate and compile character mapping tables: + mkcharmaps: +- CC=$(CC) OPT=$(OPT) ./mkmakchr > charmaps/makefile ++ CC=$(CC) OPT="$(OPT)" ./mkmakchr > charmaps/makefile + $(MAKE) -f charmaps/makefile + + +@@ -239,7 +239,7 @@ + + # define generic rule to generate and compile character mapping tables: + charmaps/%.o: charmaps/%.map mkchrtab charmaps.h +- CC=$(CC) OPT=$(OPT) ./mkchrtab $< ++ CC=$(CC) OPT="$(OPT)" ./mkchrtab $< + + + ############################################################################# +@@ -356,8 +356,7 @@ + mkdir -p $(lrundir) + $(INSTALL) ../usrshare/* $(lrundir) mkdir -p $(lmandir)/man1 - $(INSTALL) --mode=+r,u+w ../man/mined.1 $(lmandir)/man1 - if (ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(lmandir)/man1/mined.1; fi diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist index 442592294b1d..ec04f2d272c3 100644 --- a/editors/mined/pkg-plist +++ b/editors/mined/pkg-plist @@ -1,23 +1,24 @@ bin/mined -%%PORTDOCS%%%%DOCSDIR%%/help/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/help/README -%%PORTDOCS%%%%DOCSDIR%%/help/Xdefaults.mined -%%PORTDOCS%%%%DOCSDIR%%/help/bdf18to20 -%%PORTDOCS%%%%DOCSDIR%%/help/bdf18to20.sed -%%PORTDOCS%%%%DOCSDIR%%/help/configure-xterm -%%PORTDOCS%%%%DOCSDIR%%/help/lmined -%%PORTDOCS%%%%DOCSDIR%%/help/makeprint -%%PORTDOCS%%%%DOCSDIR%%/help/mined.desktop -%%PORTDOCS%%%%DOCSDIR%%/help/mined.hlp -%%PORTDOCS%%%%DOCSDIR%%/help/minedmar -%%PORTDOCS%%%%DOCSDIR%%/help/minedmar.bat -%%PORTDOCS%%%%DOCSDIR%%/help/mterm -%%PORTDOCS%%%%DOCSDIR%%/help/profile.mined -%%PORTDOCS%%%%DOCSDIR%%/help/umined -%%PORTDOCS%%%%DOCSDIR%%/help/uprint -%%PORTDOCS%%%%DOCSDIR%%/help/uterm -%%PORTDOCS%%%%DOCSDIR%%/help/wmined -%%PORTDOCS%%%%DOCSDIR%%/help/wmined.bat -%%PORTDOCS%%%%DOCSDIR%%/help/xinitrc.mined -%%PORTDOCS%%%%DOCSDIR%%/help/xmined -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help +%%DATADIR%%/CHANGES +%%DATADIR%%/README +%%DATADIR%%/Xdefaults.mined +%%DATADIR%%/bdf18to20 +%%DATADIR%%/bdf18to20.sed +%%DATADIR%%/configure-xterm +%%DATADIR%%/installfonts +%%DATADIR%%/lmined +%%DATADIR%%/makeprint +%%DATADIR%%/mined.desktop +%%DATADIR%%/mined.hlp +%%DATADIR%%/minedmar +%%DATADIR%%/mlterm_key +%%DATADIR%%/mlterm_main +%%DATADIR%%/mterm +%%DATADIR%%/profile.mined +%%DATADIR%%/umined +%%DATADIR%%/uprint +%%DATADIR%%/uterm +%%DATADIR%%/wmined +%%DATADIR%%/xinitrc.mined +%%DATADIR%%/xmined +@dirrm %%DATADIR%% |