summaryrefslogtreecommitdiff
path: root/sysutils/xnc/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xnc/patches')
-rw-r--r--sysutils/xnc/patches/patch-ab52
-rw-r--r--sysutils/xnc/patches/patch-ac12
-rw-r--r--sysutils/xnc/patches/patch-ad16
-rw-r--r--sysutils/xnc/patches/patch-ae10
-rw-r--r--sysutils/xnc/patches/patch-af10
-rw-r--r--sysutils/xnc/patches/patch-ag17
-rw-r--r--sysutils/xnc/patches/patch-ah20
-rw-r--r--sysutils/xnc/patches/patch-aj13
-rw-r--r--sysutils/xnc/patches/patch-ak12
9 files changed, 100 insertions, 62 deletions
diff --git a/sysutils/xnc/patches/patch-ab b/sysutils/xnc/patches/patch-ab
index 50e402c1465..f828f1ae5c4 100644
--- a/sysutils/xnc/patches/patch-ab
+++ b/sysutils/xnc/patches/patch-ab
@@ -1,37 +1,47 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ab,v 1.2 2002/07/08 14:25:05 jschauma Exp $
---- Makefile.in.orig Mon Jun 25 15:50:51 2001
-+++ Makefile.in
-@@ -190,28 +190,30 @@
+--- Makefile.in.orig Sun Jul 7 12:45:58 2002
++++ Makefile.in Sun Jul 7 12:50:17 2002
+@@ -256,31 +256,33 @@
install: install-$(PLUGINS)
#Installing X Northern Captain...
+- $(INSD) $(INSTDIR)
- $(INS) ./users.xnc $(INSTDIR)
- $(INS) ./groups.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
- $(INS) ./rpm.xnc $(INSTDIR)
+- $(INS) ./rpm.xnc $(INSTDIR)
- $(INS) ./zips.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
- $(INS) ./gzip.xnc $(INSTDIR)
- $(INS) ./bzip.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
+- $(INSD) $(INSTMAN)
+- $(INSM) ./yo-man/*.1 $(INSTMAN)/man1
- $(INS) ./ives/ives $(INSTDIR)
-- $(INS) ./ives/es $(INSTDIR)
-- $(INS) ./ives/vs $(INSTDIR)
+- $(INS) ./ives/iedit $(INSTDIR)
+- $(INS) ./ives/iview $(INSTDIR)
- $(INS) ./xsetup/xncsetup $(INSTDIR)
- $(INS) ./xjroot/xjpegroot $(INSTDIR)
- $(INS) ./launch/xnlaunch $(INSTDIR)
+- $(INS) ./resloader/xncloader $(INSTDIR)
- /bin/sh ./replace.script
++ #$(INSD) $(INSTDIR)
++ $(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
++ $(INSTALL_SCRIPT) ./rpm.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
++ $(INSTALL_SCRIPT) ./gzip.xnc $(INSTDIR)
++ $(INSTALL_SCRIPT) ./bzip.xnc $(INSTDIR)
++ $(INSTALL_PROGRAM) ./nc $(INSTDIR)/xnc
++ #$(INSD) $(INSTMAN)
++ #$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
+ $(INSTALL_PROGRAM) ./ives/ives $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./ives/es $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./ives/vs $(INSTDIR)
++ $(INSTALL_PROGRAM) ./ives/iedit $(INSTDIR)
++ $(INSTALL_PROGRAM) ./ives/iview $(INSTDIR)
+ $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR)
+ $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
+ $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
-+# /bin/sh ./replace.script
++ $(INSTALL_PROGRAM) ./resloader/xncloader $(INSTDIR)
++ #/bin/sh ./replace.script
@echo "Don't foget run 'xncsetup' before starting XNC"
@@ -39,10 +49,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
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
++ #$(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
index b765e8d2396..05cd4e2e8c9 100644
--- a/sysutils/xnc/patches/patch-ac
+++ b/sysutils/xnc/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ac,v 1.2 2002/07/08 14:25:05 jschauma Exp $
---- ives/makefile.in.orig Thu Aug 30 15:27:39 2001
-+++ ives/makefile.in
+--- ives/makefile.in.orig Sun Jul 7 12:57:19 2002
++++ ives/makefile.in Sun Jul 7 12:57:59 2002
@@ -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)
+- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- PROGRAM =ives es vs $(IMAGEOBJS) $(JDEP)
+ PROGRAM =ives iedit iview $(IMAGEOBJS) $(JDEP)
diff --git a/sysutils/xnc/patches/patch-ad b/sysutils/xnc/patches/patch-ad
index 92e8fb1f403..1581ba900db 100644
--- a/sysutils/xnc/patches/patch-ad
+++ b/sysutils/xnc/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ad,v 1.2 2002/07/08 14:25:05 jschauma 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
+--- xsetup/makefile.in.orig Sun Jul 7 12:59:01 2002
++++ xsetup/makefile.in Sun Jul 7 12:59:34 2002
+@@ -45,7 +45,7 @@
+
+ CXXINCLUDES=$(XINC) -I../image2 -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)
+- LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
PROGRAM =xncsetup
diff --git a/sysutils/xnc/patches/patch-ae b/sysutils/xnc/patches/patch-ae
index 5b676ef996c..5a3ae0da8f1 100644
--- a/sysutils/xnc/patches/patch-ae
+++ b/sysutils/xnc/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ae,v 1.2 2002/07/08 14:25:05 jschauma Exp $
---- xjroot/makefile.in.orig Thu Aug 30 15:43:09 2001
-+++ xjroot/makefile.in
+--- xjroot/makefile.in.orig Sun Jul 7 13:00:26 2002
++++ xjroot/makefile.in Sun Jul 7 13:00:51 2002
@@ -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)
+- LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=../image2/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
index ab6457e7641..56dd23255a0 100644
--- a/sysutils/xnc/patches/patch-af
+++ b/sysutils/xnc/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-af,v 1.2 2002/07/08 14:25:06 jschauma Exp $
---- launch/makefile.in.orig Thu Aug 30 15:46:12 2001
-+++ launch/makefile.in
+--- launch/makefile.in.orig Sun Jul 7 13:01:34 2002
++++ launch/makefile.in Sun Jul 7 13:01:49 2002
@@ -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)
+- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
PROGRAM =xnlaunch $(IMAGEOBJS) $(JDEP)
diff --git a/sysutils/xnc/patches/patch-ag b/sysutils/xnc/patches/patch-ag
index 97b0cdd23ba..aa5a17c28b0 100644
--- a/sysutils/xnc/patches/patch-ag
+++ b/sysutils/xnc/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ag,v 1.2 2002/07/08 14:25:06 jschauma Exp $
---- plugins/five/makefile.in.orig Tue Mar 13 19:05:52 2001
-+++ plugins/five/makefile.in
+--- plugins/five/makefile.in.orig Sun Jul 7 12:50:31 2002
++++ plugins/five/makefile.in Sun Jul 7 12:55:45 2002
@@ -18,6 +18,11 @@
@MCOMMON@
@@ -14,22 +14,23 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
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
+@@ -26,9 +31,13 @@
+ -I../common -I../../ftplib -I../../resloader
CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-PROGRAM =libxncfive.so
+#PROGRAM =libxncfive.so
-+PROGRAM = libxncfive.a
++PROGRAM =libxncfive.a
-all:: $(PROGRAM)
+#all:: $(PROGRAM)
+all: $(IOBJS)
-+ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
++ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
++ $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
../gui.o: ../gui.cxx
-@@ -87,7 +95,8 @@
+@@ -88,7 +97,8 @@
install:
diff --git a/sysutils/xnc/patches/patch-ah b/sysutils/xnc/patches/patch-ah
index 11956378a0e..3b0c612face 100644
--- a/sysutils/xnc/patches/patch-ah
+++ b/sysutils/xnc/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-ah,v 1.2 2002/07/08 14:25:06 jschauma Exp $
---- plugins/aqua/makefile.in.orig Tue Mar 13 19:05:49 2001
-+++ plugins/aqua/makefile.in
-@@ -18,6 +18,11 @@
+--- plugins/aqua/makefile.in.orig Sun Jul 7 12:53:26 2002
++++ plugins/aqua/makefile.in Sun Jul 7 12:55:14 2002
+@@ -18,6 +18,12 @@
@MCOMMON@
@@ -11,25 +11,27 @@ $NetBSD: patch-ah,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+.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
+@@ -26,9 +32,13 @@
+ -I../common -I../../ftplib -I../../resloader
CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-PROGRAM =libxncaqua.so
+#PROGRAM =libxncaqua.so
-+PROGRAM = libxncaqua.a
++PROGRAM =libxncaqua.a
-all:: $(PROGRAM)
+#all:: $(PROGRAM)
+all: $(IOBJS)
-+ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
++ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
++ $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
../gui.o: ../gui.cxx
-@@ -86,7 +94,8 @@
+@@ -87,7 +97,8 @@
install:
diff --git a/sysutils/xnc/patches/patch-aj b/sysutils/xnc/patches/patch-aj
new file mode 100644
index 00000000000..efad35447ba
--- /dev/null
+++ b/sysutils/xnc/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2002/07/08 14:25:06 jschauma Exp $
+
+--- resloader/makefile.in.orig Sun Jul 7 12:56:04 2002
++++ resloader/makefile.in Sun Jul 7 12:56:33 2002
+@@ -21,7 +21,7 @@
+ ../plugins/aqua/aquaskin.o ../plugins/five/fiveskin.o
+ CXXINCLUDES=$(XINC) $(JINC)
+ CXXOPT=$(DEFS) $(CFLAGS)
+- LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
++ LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
+
+ PROGRAM =xncloader $(IMAGENGINE)
+
diff --git a/sysutils/xnc/patches/patch-ak b/sysutils/xnc/patches/patch-ak
new file mode 100644
index 00000000000..e3507fb8797
--- /dev/null
+++ b/sysutils/xnc/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2002/07/08 14:25:07 jschauma Exp $
+
+--- Make.common.in.orig Sun Jul 7 14:34:06 2002
++++ Make.common.in Sun Jul 7 14:34:27 2002
+@@ -26,6 +26,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL@ -s -m 755
+ INSTALL_DATA = @INSTALL@ -m 644
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INS=@INSTALL@ -m 755
+ INSM=@INSTALL@ -m 644
+ INSD=@INSTALL@ -d -m 755
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 23:06:47 +0000