diff options
Diffstat (limited to 'cad/xcircuit/patches/patch-ac')
| -rw-r--r-- | cad/xcircuit/patches/patch-ac | 67 |
1 files changed, 56 insertions, 11 deletions
diff --git a/cad/xcircuit/patches/patch-ac b/cad/xcircuit/patches/patch-ac index 957b0686f97..6f04bf9a27a 100644 --- a/cad/xcircuit/patches/patch-ac +++ b/cad/xcircuit/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2004/11/19 13:24:11 adam Exp $ +$NetBSD: patch-ac,v 1.3 2006/11/12 14:25:50 dmcmahill Exp $ ---- Makefile.in.orig 2004-10-01 04:25:06.000000000 +0000 -+++ Makefile.in -@@ -51,7 +51,7 @@ AUTOMAKE = @AUTOMAKE@ +--- Makefile.in.orig 2006-06-14 09:15:38.000000000 +0100 ++++ Makefile.in 2006-09-01 01:55:36.000000000 +0100 +@@ -102,7 +102,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -11,11 +11,56 @@ $NetBSD: patch-ac,v 1.2 2004/11/19 13:24:11 adam Exp $ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -@@ -82,6 +82,7 @@ LIBS = @LIBS@ - LIB_SPECS = @LIB_SPECS@ - LTLIBOBJS = @LTLIBOBJS@ - M4 = @M4@ -+RM ?= rm -f +@@ -123,7 +123,7 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTALL_TARGET = @INSTALL_TARGET@ +-INTERP_PATH = @INTERP_PATH@ ++INTERP_PATH = tcl + LD = @LD@ + LDDL_FLAGS = @LDDL_FLAGS@ + LDFLAGS = @LDFLAGS@ +@@ -155,7 +155,7 @@ + SHLIB_LD = @SHLIB_LD@ + SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ + SPICE_EXEC = @SPICE_EXEC@ +-STARTUP_FILE = @STARTUP_FILE@ ++STARTUP_FILE = ../startup.script + STDLIBS = @STDLIBS@ + STRIP = @STRIP@ + SUBDIRS = @SUBDIRS@ +@@ -226,7 +226,7 @@ - # Man page - M4_DEFS = @M4_DEFS@ @DEFS@ + # Directories for app-defaults file and manual page + appdefaultsdir = $(datadir)/$(PACKAGE)-$(VERSION)/app-defaults +-appmandir = $(datadir)/$(PACKAGE)-$(VERSION)/man ++appmandir = $(mandir) + PATHNAMES = -DPROG_VERSION=$(VERSION) \ + -DPROG_REVISION=$(REVISION) \ + -DCAD_DIR=\"$(libdir)\" \ +@@ -640,14 +640,14 @@ + xcwrap.c -c -o xcwrap.o + + lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND} +- $(RM) lib/xcircuit${SHDLIB_EXT} ++# $(RM) lib/xcircuit${SHDLIB_EXT} + $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \ + ${xcircuit_OBJECTS} ${xcircuit_LDADD} ${LDFLAGS} \ + ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIB_SPECS} \ + ${SHLIB_LIB_SPECS} + + xcircexec$(EXEEXT): xcircexec.o +- $(RM) ./xcircexec$(EXEEXT) ++# $(RM) ./xcircexec$(EXEEXT) + $(CC) ${CFLAGS} ${CPPFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \ + xcircexec.c -o xcircexec$(EXEEXT) ${LDFLAGS} \ + ${LIBS} ${LIB_SPECS} ${EXTRA_LIB_SPECS} +@@ -694,7 +694,7 @@ + $(mkinstalldirs) $(DESTDIR)$(appdefaultsdir) + $(mkinstalldirs) $(DESTDIR)$(appmandir) + $(INSTALL_DATA) lib/XCircuit.ad $(DESTDIR)$(appdefaultsdir)/XCircuit +- $(INSTALL_DATA) lib/xcircuit.1 $(DESTDIR)$(appmandir)/xcircuit.1 ++ $(INSTALL_DATA) lib/xcircuit.1 $(DESTDIR)$(appmandir)/man1/xcircuit.1 + @echo "Installing library files" + $(mkinstalldirs) $(DESTDIR)$(librarydir) + ( cd lib ; for i in $(PROLOGUE_FILE) *.lps; do \ |