diff options
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/vipec/Makefile | 6 | ||||
| -rw-r--r-- | cad/vipec/files/patch-sum | 4 | ||||
| -rw-r--r-- | cad/vipec/patches/patch-aa | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index c045a1c11b8..16adfa3e960 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/03/23 22:07:17 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:23 dmcmahill Exp $ # DISTNAME= vipec-1.07 @@ -12,6 +12,10 @@ DEPENDS+= qt1-1.44:../../x11/qt1 USE_X11= yes +PATH= ${X11BASE}/qt1/bin:$$PATH + +MAKE_ENV+= "QTDIR=${X11BASE}/qt1" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vipec ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vipec diff --git a/cad/vipec/files/patch-sum b/cad/vipec/files/patch-sum index 21be69009e4..734431e6464 100644 --- a/cad/vipec/files/patch-sum +++ b/cad/vipec/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:17 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $ -MD5 (patch-aa) = a56454f95657188cc5d4eb3132239d76 +MD5 (patch-aa) = 28831310d38588f82020bdcf415d0a2a diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa index 15f693cd361..65e59713065 100644 --- a/cad/vipec/patches/patch-aa +++ b/cad/vipec/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $ --- Makefile.orig Tue May 25 02:52:00 1999 +++ Makefile Thu Mar 23 17:01:44 2000 @@ -6,12 +6,12 @@ $NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $ CFLAGS = -Wall -W -O2 -fno-strength-reduce CXXFLAGS= -Wall -W -O2 -fno-strength-reduce -INCPATH = -I$(QTDIR)/include -+INCPATH = -I$(X11BASE)/include/qt1 -I$(X11BASE)/include ++INCPATH = -I${X11BASE}/include -I$(QTDIR)/include LINK = g++ LFLAGS = -LIBS = -L$(QTDIR)/lib -lqt -lX11 -lXext -MOC = moc -+LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lqt1 -lX11 -lXext -+MOC = moc1 ++LIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt -lX11 -lXext ++MOC = moc TAR = tar -cf |