summaryrefslogtreecommitdiff
path: root/sysutils/xnc/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xnc/patches')
-rw-r--r--sysutils/xnc/patches/patch-aa13
-rw-r--r--sysutils/xnc/patches/patch-ab48
-rw-r--r--sysutils/xnc/patches/patch-ac13
-rw-r--r--sysutils/xnc/patches/patch-ad13
-rw-r--r--sysutils/xnc/patches/patch-ae13
-rw-r--r--sysutils/xnc/patches/patch-af13
-rw-r--r--sysutils/xnc/patches/patch-ag41
-rw-r--r--sysutils/xnc/patches/patch-ah41
-rw-r--r--sysutils/xnc/patches/patch-ai16
9 files changed, 211 insertions, 0 deletions
diff --git a/sysutils/xnc/patches/patch-aa b/sysutils/xnc/patches/patch-aa
new file mode 100644
index 00000000000..f6ecea6f5c1
--- /dev/null
+++ b/sysutils/xnc/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- filedir/makefile.in.orig Wed Apr 25 20:11:20 2001
++++ filedir/makefile.in Wed Apr 25 20:11:28 2001
+@@ -34,7 +34,7 @@
+ @MCOMMON@
+
+ VERSION = 3.20.1
+-MAGIC = /usr/share/magic
++MAGIC = /usr/share/misc/magic
+ #MAGIC = /usr/local/etc/magic
+
+ MAGDEFS = -DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS)# -Dvoid=int
diff --git a/sysutils/xnc/patches/patch-ab b/sysutils/xnc/patches/patch-ab
new file mode 100644
index 00000000000..50e402c1465
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ab
@@ -0,0 +1,48 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- Makefile.in.orig Mon Jun 25 15:50:51 2001
++++ Makefile.in
+@@ -190,28 +190,30 @@
+
+ install: install-$(PLUGINS)
+ #Installing X Northern Captain...
+- $(INS) ./users.xnc $(INSTDIR)
+- $(INS) ./groups.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
+ $(INS) ./rpm.xnc $(INSTDIR)
+- $(INS) ./zips.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
+ $(INS) ./gzip.xnc $(INSTDIR)
+ $(INS) ./bzip.xnc $(INSTDIR)
+- $(INS) ./nc $(INSTDIR)/xnc
++ $(INSTALL_PROGRAM) ./nc $(INSTDIR)/xnc
+ $(INSM) ./yo-man/*.1 $(INSTMAN)/man1
+- $(INS) ./ives/ives $(INSTDIR)
+- $(INS) ./ives/es $(INSTDIR)
+- $(INS) ./ives/vs $(INSTDIR)
+- $(INS) ./xsetup/xncsetup $(INSTDIR)
+- $(INS) ./xjroot/xjpegroot $(INSTDIR)
+- $(INS) ./launch/xnlaunch $(INSTDIR)
+- /bin/sh ./replace.script
++ $(INSTALL_PROGRAM) ./ives/ives $(INSTDIR)
++ $(INSTALL_PROGRAM) ./ives/es $(INSTDIR)
++ $(INSTALL_PROGRAM) ./ives/vs $(INSTDIR)
++ $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR)
++ $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
++ $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
++# /bin/sh ./replace.script
+ @echo "Don't foget run 'xncsetup' before starting XNC"
+
+
+ install-plugins:
+ mkdir -p $(INSTPLUG)
+- $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
+- $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
++# $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
++# $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
++ cd ./plugins/five && make install
++ cd ./plugins/aqua && make install
+
+ install-:
+ @echo "Skipping..."
diff --git a/sysutils/xnc/patches/patch-ac b/sysutils/xnc/patches/patch-ac
new file mode 100644
index 00000000000..b765e8d2396
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- ives/makefile.in.orig Thu Aug 30 15:27:39 2001
++++ ives/makefile.in
+@@ -31,7 +31,7 @@
+ STYLE=-DOLD_STYLE
+
+ CXXOPT=-DIVES $(NO_ALT) $(STYLE) $(DEB) $(DEFS) $(CFLAGS)
+- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L../image -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L../image -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
+
+ PROGRAM =ives es vs $(IMAGEOBJS) $(JDEP)
+
diff --git a/sysutils/xnc/patches/patch-ad b/sysutils/xnc/patches/patch-ad
new file mode 100644
index 00000000000..92e8fb1f403
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- xsetup/makefile.in.orig Thu Aug 30 15:39:30 2001
++++ xsetup/makefile.in
+@@ -25,7 +25,7 @@
+ ../commonfuncs.o ../image/imload.o ../xdndclass.o ../xncdebug.o
+ CXXINCLUDES=$(XINC) -I../xbitmaps
+ CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
+- LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
+
+ PROGRAM =xncsetup
+
diff --git a/sysutils/xnc/patches/patch-ae b/sysutils/xnc/patches/patch-ae
new file mode 100644
index 00000000000..5b676ef996c
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- xjroot/makefile.in.orig Thu Aug 30 15:43:09 2001
++++ xjroot/makefile.in
+@@ -20,7 +20,7 @@
+ IOBJS =xjpegroot.o
+ CXXINCLUDES=$(XINC) $(JINC)
+ CXXOPT=$(DEFS) $(CFLAGS)
+- LOCAL_LIBRARIES=../image/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=../image/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
+
+ PROGRAM =xjpegroot $(IMAGENGINE)
+
diff --git a/sysutils/xnc/patches/patch-af b/sysutils/xnc/patches/patch-af
new file mode 100644
index 00000000000..ab6457e7641
--- /dev/null
+++ b/sysutils/xnc/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- launch/makefile.in.orig Thu Aug 30 15:46:12 2001
++++ launch/makefile.in
+@@ -28,7 +28,7 @@
+ STYLE=-DOLD_STYLE
+
+ CXXOPT=$(DEFS) $(CFLAGS)
+- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
+
+ PROGRAM =xnlaunch $(IMAGEOBJS) $(JDEP)
+
diff --git a/sysutils/xnc/patches/patch-ag b/sysutils/xnc/patches/patch-ag
new file mode 100644
index 00000000000..97b0cdd23ba
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ag
@@ -0,0 +1,41 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- plugins/five/makefile.in.orig Tue Mar 13 19:05:52 2001
++++ plugins/five/makefile.in
+@@ -18,6 +18,11 @@
+
+ @MCOMMON@
+
++CXX = $(LIBTOOL) --mode=compile $(CC)
++
++.c.o:
++ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
++
+ PLUGINFLAGS=$(SHAREFLAGS)
+
+ IOBJS =fiveplugin.o fivegeom.o fivefuncs.o fiveskin.o fivegui.o \
+@@ -25,9 +30,12 @@
+ CXXINCLUDES=$(XINC) -I../../image -I../../xbitmaps -I../.. -I../common -I../../ftplib
+ CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
+
+-PROGRAM =libxncfive.so
++#PROGRAM =libxncfive.so
++PROGRAM = libxncfive.a
+
+-all:: $(PROGRAM)
++#all:: $(PROGRAM)
++all: $(IOBJS)
++ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
+
+
+ ../gui.o: ../gui.cxx
+@@ -87,7 +95,8 @@
+
+
+ install:
+- ./xncsetup
++# ./xncsetup
++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
+
+ uninstall:
+ #Uninstalling IVES..
diff --git a/sysutils/xnc/patches/patch-ah b/sysutils/xnc/patches/patch-ah
new file mode 100644
index 00000000000..11956378a0e
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ah
@@ -0,0 +1,41 @@
+$NetBSD: patch-ah,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- plugins/aqua/makefile.in.orig Tue Mar 13 19:05:49 2001
++++ plugins/aqua/makefile.in
+@@ -18,6 +18,11 @@
+
+ @MCOMMON@
+
++CXX = $(LIBTOOL) --mode=compile $(CC)
++
++.c.o:
++ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
++
+ PLUGINFLAGS=$(SHAREFLAGS)
+
+ IOBJS =aquaplugin.o aquagui.o aquafuncs.o aquageom.o aquapanel.o\
+@@ -25,9 +30,12 @@
+ CXXINCLUDES=$(XINC) -I../../image -I../../xbitmaps -I../.. -I../common -I../../ftplib
+ CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
+
+-PROGRAM =libxncaqua.so
++#PROGRAM =libxncaqua.so
++PROGRAM = libxncaqua.a
+
+-all:: $(PROGRAM)
++#all:: $(PROGRAM)
++all: $(IOBJS)
++ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
+
+
+ ../gui.o: ../gui.cxx
+@@ -86,7 +94,8 @@
+
+
+ install:
+- ./xncsetup
++# ./xncsetup
++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
+
+ uninstall:
+ $(RM) -f $(PROGRAM)
diff --git a/sysutils/xnc/patches/patch-ai b/sysutils/xnc/patches/patch-ai
new file mode 100644
index 00000000000..be7b7ae6aee
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+
+--- plugins/common/makefile.in.orig Thu Aug 30 21:30:56 2001
++++ plugins/common/makefile.in
+@@ -18,6 +18,11 @@
+
+ @MCOMMON@
+
++CXX = $(LIBTOOL) --mode=compile $(CC)
++
++.c.o:
++ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
++
+ CXXINCLUDES=$(XINC) -I../xbitmaps
+ CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
+