Update to 2.4

PR:		32515
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

7 files changed, 42 insertions, 90 deletions

diff --git a/editors/fine/Makefile b/editors/fine/Makefile
index 7321fbef4d53..c8e4414b1450 100644
--- a/editors/fine/Makefile
+++ b/editors/fine/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	fine
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	editors
-# DEAD MASTER_SITES=	ftp://razor.fer.uni-lj.si/pub/software/bojank/fine/
-MASTER_SITES=	http://dccnet.linux.tucows.com/files/x11/office/
+MASTER_SITES=	http://www.lrv.fri.uni-lj.si/~bojank/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
+NO_WRKSUBDIR=	yes
+
 USE_QT_VER=	2
-WRKSRC=		${WRKDIR}/fine
+USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 
 .include <bsd.port.pre.mk>
 
@@ -25,11 +27,8 @@ CFLAGS+=	-O0
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/fine
-	${INSTALL_DATA} ${WRKSRC}/.editor ${PREFIX}/share/fine/editor
-.for template in C++.template LaTeX.template h.template  html.template
-	${INSTALL_DATA} ${WRKSRC}/${template} ${PREFIX}/share/fine/
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/fine ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/fine ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/*.template ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/editors/fine/distinfo b/editors/fine/distinfo
index a73181d5befb..68c2812a9e7c 100644
--- a/editors/fine/distinfo
+++ b/editors/fine/distinfo
@@ -1 +1 @@
-MD5 (fine2.3.tar.gz) = 95e75bf5d9ad99497df7e0e98f0b6737
+MD5 (fine2.4.tar.gz) = ea0008a845b4a8b0f63eeff2c68b2012
diff --git a/editors/fine/files/patch-aa b/editors/fine/files/patch-aa
index 2b746ab88c59..11241051c455 100644
--- a/editors/fine/files/patch-aa
+++ b/editors/fine/files/patch-aa
@@ -1,32 +1,27 @@
---- Makefile.orig	Fri Nov 26 13:11:08 1999
-+++ Makefile	Fri Nov 26 13:11:11 1999
-@@ -1,16 +1,17 @@
+--- Makefile.orig	Sat Jun 23 00:24:38 2001
++++ Makefile	Sun Dec  2 16:38:37 2001
+@@ -1,8 +1,8 @@
 -INCLUDE = -I. -I$(QTDIR)/include -I$(HOME)/include -I./icons
--DESTLIB = $(HOME)/lib                                                              # where to put library
++INCLUDE = -I. -I./icons ${QTCPPFLAGS}
+ DESTLIB = $(HOME)/lib                                                              # where to put library
 -LIB = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(DESTLIB)
--
++LIB = -L. ${LIBQT} ${QTCFGLIBS}
+ 
 -MOC 	= $(QTDIR)/bin/moc
--CC 	= g++
--C	= gcc
-+QTDIR=	${X11BASE}
-+INCLUDE = -I. -I$(QTDIR)/include -I$(QTDIR)/include/qt2 -I$(HOME)/include -I./icons
-+DESTLIB = ${PREFIX}/lib
-+LIB = -L${X11BASE}/lib -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L.
-+
-+MOC 	= $(QTDIR)/bin/moc2
-+#CC 	= g++
-+#C	= gcc
++#MOC 	= $(QTDIR)/bin/moc
+ CC 	= g++
+ C	= gcc
  AR	= ar
- M	= moc_
+@@ -10,7 +10,7 @@
  RM = rm -f
  KDOC = kdoc -H -d doc -e
  
--OPTIONS	= -g -ansi -fguiding-decls
-+OPTIONS	= ${CFLAGS} -fguiding-decls -DFINEDIR=\""${PREFIX}/share/fine\""
+-OPTIONS	= -O2 -ansi
++OPTIONS	= ${CXXFLAGS}
  
  OBJ	= qsmartedit.o qcolormultilinedit.o undoredo.o qeditor.o qfontselect.o qcolordialog.o qcolorlistboxitem.o qkeyworddialog.o qhotkeydialog.o
  METAOBJ = qsmartedit.mo qcolormultilinedit.mo qeditor.mo qfontselect.mo qcolordialog.mo qkeyworddialog.mo qhotkeydialog.mo
-@@ -35,14 +36,13 @@
+@@ -35,14 +35,13 @@
  
  $(TARGET):	$(OBJ) $(METAOBJ)
  	$(AR) r $(TARGET) $(OBJ) $(METAOBJ)
@@ -43,4 +38,4 @@
  
  fine:	fine.o fine.mo
 -	$(CC) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
-+	$(CXX) -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt2 -lX11 -lXext
++	$(CXX) -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine
diff --git a/editors/fine/files/patch-ab b/editors/fine/files/patch-ab
index 35c27892fd39..eda2a0f86f19 100644
--- a/editors/fine/files/patch-ab
+++ b/editors/fine/files/patch-ab
@@ -1,55 +1,17 @@
---- fine.C.orig	Fri Oct 29 04:02:09 1999
-+++ fine.C	Fri Nov 26 13:12:09 1999
-@@ -227,7 +227,7 @@
- 
-   if (sc == NULL)
-   { sc = new QBinaryTree<Configuration>(shortcut);
--    sprintf(s,"%s/.fine/.editor",getenv("HOME"));
-+    sprintf(s,"%s/editor",FINEDIR);
-     f = fopen(s,"rt");
-     if (f != NULL) 
-     { while (!feof(f))
-@@ -236,7 +236,7 @@
+--- fine.C.orig	Sat Jun 23 02:40:45 2001
++++ fine.C	Sun Dec  2 19:54:21 2001
+@@ -1,5 +1,4 @@
+ #define _GNU_SOURCE 1
+-#include <features.h>
+ #include <stdlib.h>
+ #include <qmsgbox.h>
+ #include <fine.h>
+@@ -237,7 +236,7 @@
           }
         fclose(f);
         } else QMessageBox::warning(ed,"Couldn't find main configuration file",
 -    "Couldn't find .editor file in your .fine directory!\nTry to type: make install in the FINE distribution directory.");
-+    "Couldn't find editor file in your .fine directory!\nTry to type: make install in the FINE distribution directory.");
++    "Couldn't find .editor file in your .fine directory!");
      }
  
    sysmenu = new QMenuBar(this,"Editor System Main Menu");
-@@ -430,7 +430,7 @@
-   if (ptrsc != NULL)
-   {  sh = ptrsc->Element();
-       s = new char[strlen(getenv("HOME"))+strlen(sh.filename)+200];
--      sprintf(s,"%s/.fine/%s",getenv("HOME"),sh.filename);
-+      sprintf(s,"%s/%s",FINEDIR,sh.filename);
-       w->editor()->readConfig(s);
-       delete [] s;
-       }
-@@ -470,7 +470,7 @@
-         printf("\nTemplate file:%s, Compiler:%s, Previewer:%s",defsc.filename,
-           (defsc.compiler != NULL? defsc.compiler:"(null)"),
- 	     (defsc.previewer != NULL? defsc.previewer:"(null)"));
--        sprintf(s,"%s/.fine/%s",getenv("HOME"),defsc.filename);
-+        sprintf(s,"%s/%s",FINEDIR,defsc.filename);
-         ed->readConfig(s);
-         ed->repaint();
-         fflush(stdout);
-@@ -517,14 +517,14 @@
-  { if (ptrsc != NULL) Delete(sc,ptrsc->Element());
-     sc->Insert(*scw);
-     ptrsc = sc->Locate(*scw);
--    sprintf(fns,"%s/.fine/.editor",getenv("HOME"));
-+    sprintf(fns,"%s/editor",FINEDIR);
-     f = fopen(fns,"wt");
-     fprintf(f,"# This is file used by FINE editor\n"); 
-     fprintf(f,"# It contains information about all template files used by FINE\n");
-     saveConfigTree(f,sc->Left());
-     saveConfigTree(f,sc->Right());
-     fclose(f);
--    sprintf(fns,"%s/.fine/%s",getenv("HOME"),scw->filename);
-+    sprintf(fns,"%s/%s",FINEDIR,scw->filename);
-     f = fopen(fns,"wt");
-     fprintf(f,"# This is %s template file\n",scw->name);
-     fprintf(f,"\n# screen settings\n");
diff --git a/editors/fine/files/patch-ac b/editors/fine/files/patch-ac
deleted file mode 100644
index 86b512ce4a3d..000000000000
--- a/editors/fine/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- fine.C.orig	Thu Dec  9 10:21:14 1999
-+++ fine.C	Thu Dec  9 10:21:20 1999
-@@ -1,5 +1,4 @@
- #define _GNU_SOURCE 1
--#include <features.h>
- #include <stdlib.h>
- #include <qmsgbox.h>
- #include <fine.h>
diff --git a/editors/fine/pkg-descr b/editors/fine/pkg-descr
index d743e50a2fee..951a80e443f8 100644
--- a/editors/fine/pkg-descr
+++ b/editors/fine/pkg-descr
@@ -3,4 +3,4 @@ a nice GUI (uses the Qt toolkit) that can parse syntax
 and colour keywords and other things.  It can also be programmed
 to insert text with keybindings.
 
-WWW: http://razor.fer.uni-lj.si/~bojank/fine.html
+WWW: http://www.lrv.fri.uni-lj.si/~bojank/fine.html
diff --git a/editors/fine/pkg-plist b/editors/fine/pkg-plist
index 8f35b650df0d..46850bfb2008 100644
--- a/editors/fine/pkg-plist
+++ b/editors/fine/pkg-plist
@@ -1,7 +1,11 @@
 bin/fine
 share/fine/C++.template
 share/fine/LaTeX.template
-share/fine/editor
+share/fine/Matlab.template
 share/fine/h.template
 share/fine/html.template
+share/fine/lyr.template
+share/fine/pascal.template
+share/fine/perl.template
+share/fine/postscript.template
 @dirrm share/fine