mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Update to fine 2.3 to unbreak this port.

Browse Source 
Fine now works with qt2 so we use that to unbreak for systems without
at least egcs (old gcc built qt, new gcc needed to build fine, new gcc
is used for qt2).
This commit is contained in:
Chris Piazza 1999-11-26 21:21:34 +00:00
parent 3ea2c3ae2c
commit 0c489cb2cb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=23419
4 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/fine/Makefile
View File

@ -6,8 +6,8 @@
# $FreeBSD$
#
DISTNAME= fine
PKGNAME= fine-2.1
DISTNAME= fine2.3
PKGNAME= fine-2.3
CATEGORIES= editors
MASTER_SITES= ftp://razor.fer.uni-lj.si/pub/software/bojank/fine/
@ -15,15 +15,9 @@ MAINTAINER= cpiazza@FreeBSD.org
USE_NEWGCC= yes
USE_GMAKE= yes
USE_QT= yes
USE_QT2= yes
WRKSRC= ${WRKDIR}/fine
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 400004
BROKEN= 'This program needs NEWGCC but links with QT, which is built with an old version.'
.endif
do-install:
@${MKDIR} ${PREFIX}/share/fine
${INSTALL_DATA} ${WRKSRC}/.editor ${PREFIX}/share/fine/editor
@ -32,4 +26,4 @@ do-install:
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/fine ${PREFIX}/bin
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
editors/fine/distinfo
View File

@ -1 +1 @@
MD5 (fine.tar.gz) = 0a9e6db4c7f266ca470264e3475b4181
MD5 (fine2.3.tar.gz) = 95e75bf5d9ad99497df7e0e98f0b6737

38
editors/fine/files/patch-aa
View File

@ -1,28 +1,32 @@
--- Makefile.orig Tue Mar 16 09:14:22 1999
+++ Makefile Tue Aug 17 16:15:41 1999
@@ -1,14 +1,15 @@
-INCLUDE = -I$(QTDIR)/include -I. -I$(HOME)/include -I./icons
--- Makefile.orig Fri Nov 26 13:11:08 1999
+++ Makefile Fri Nov 26 13:11:11 1999
@@ -1,16 +1,17 @@
-INCLUDE = -I. -I$(QTDIR)/include -I$(HOME)/include -I./icons
-DESTLIB = $(HOME)/lib # where to put library
-LIB = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(DESTLIB)
+QTDIR = ${X11BASE}
+INCLUDE = -I$(QTDIR)/include -I ${QTDIR}/include/X11/qt -I. -I$(HOME)/include -I./icons
+DESTLIB = ${PREFIX}/lib
+LIB = -L${LOCALBASE}/lib -L$(QTDIR)/lib -L$(DESTLIB) -L.
MOC = $(QTDIR)/bin/moc
-
-MOC = $(QTDIR)/bin/moc
-CC = g++
-C = gcc
+#CC = ${CX
+#CXX = ${CXX}
+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
AR = ar
M = moc_
RM = rm -f
KDOC = kdoc -H -d doc -e
-OPTIONS = -g -ansi -fguiding-decls
+OPTIONS = ${CFLAGS} -fguiding-decls -DFINEDIR=\""${PREFIX}/share/fine\""
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
@@ -27,14 +28,13 @@
@@ -35,14 +36,13 @@
$(TARGET): $(OBJ) $(METAOBJ)
$(AR) r $(TARGET) $(OBJ) $(METAOBJ)
@ -33,10 +37,10 @@
+ $(CXX) -c $(OPTIONS) $(INCLUDE) $<
%.mo: %.h
$(MOC) $< -o $(subst .h,.C,m$<)
- $(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<)
+ $(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,m$<) -o $(subst .h,.mo,$<)
$(MOC) $< -o $(subst .h,.C,$(M)$<)
- $(CC) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<)
+ $(CXX) -c $(OPTIONS) $(INCLUDE) $(subst .h,.C,$(M)$<) -o $(subst .h,.mo,$<)
fine: fine.o fine.mo
- $(CC) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
+ $(CXX) -g -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt -lX11 -lXext
+ $(CXX) -ofine fine.o fine.mo $(OPTIONS) $(LIB) -lFine -lqt2 -lX11 -lXext

14
editors/fine/files/patch-ab
View File

@ -1,6 +1,6 @@
--- fine.C.orig Fri May 7 03:08:12 1999
+++ fine.C Tue Aug 17 17:46:57 1999
@@ -172,7 +172,7 @@
--- 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);
@ -9,7 +9,7 @@
f = fopen(s,"rt");
if (f != NULL)
{ while (!feof(f))
@@ -181,7 +181,7 @@
@@ -236,7 +236,7 @@
}
fclose(f);
} else QMessageBox::warning(ed,"Couldn't find main configuration file",
@ -18,7 +18,7 @@
}
sysmenu = new QMenuBar(this,"Editor System Main Menu");
@@ -370,7 +370,7 @@
@@ -430,7 +430,7 @@
if (ptrsc != NULL)
{ sh = ptrsc->Element();
s = new char[strlen(getenv("HOME"))+strlen(sh.filename)+200];
@ -27,7 +27,7 @@
w->editor()->readConfig(s);
delete [] s;
}
@@ -410,7 +410,7 @@
@@ -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)"));
@ -36,7 +36,7 @@
ed->readConfig(s);
ed->repaint();
fflush(stdout);
@@ -461,14 +461,14 @@
@@ -517,14 +517,14 @@
{ if (ptrsc != NULL) Delete(sc,ptrsc->Element());
sc->Insert(*scw);
ptrsc = sc->Locate(*scw);