From b3fdeba5c126474c0bfb760d1d7a1ed73bf7c711 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Sun, 29 Jul 2001 04:35:01 +0000 Subject: Upgrade to 4.4.5 --- x11-fm/xnc/Makefile | 2 +- x11-fm/xnc/distinfo | 2 +- x11-fm/xnc/files/patch-Make.common.in | 11 ------- x11-fm/xnc/files/patch-aa | 10 ------- x11-fm/xnc/files/patch-ad | 16 +++++----- x11-fm/xnc/files/patch-ae | 56 ----------------------------------- x11-fm/xnc/pkg-plist | 5 ++-- 7 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 x11-fm/xnc/files/patch-Make.common.in delete mode 100644 x11-fm/xnc/files/patch-aa delete mode 100644 x11-fm/xnc/files/patch-ae (limited to 'x11-fm') diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile index f502d2761172..cba8de10041d 100644 --- a/x11-fm/xnc/Makefile +++ b/x11-fm/xnc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xnc -PORTVERSION= 4.4.4 +PORTVERSION= 4.4.5 CATEGORIES= x11-fm MASTER_SITES= http://www.xnc.dubna.su/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/x11-fm/xnc/distinfo b/x11-fm/xnc/distinfo index 8b71a7c47e90..9425ee0df778 100644 --- a/x11-fm/xnc/distinfo +++ b/x11-fm/xnc/distinfo @@ -1 +1 @@ -MD5 (xnc-4.4.4.src.tar.gz) = 2d4501a74c78667855f2deeca1eb7ecd +MD5 (xnc-4.4.5.src.tar.gz) = 197f09edac8c600819f3a7d5804fb59e diff --git a/x11-fm/xnc/files/patch-Make.common.in b/x11-fm/xnc/files/patch-Make.common.in deleted file mode 100644 index f1161280832e..000000000000 --- a/x11-fm/xnc/files/patch-Make.common.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Make.common.in.orig Fri Jan 5 00:17:13 2001 -+++ Make.common.in Fri Jan 5 00:17:25 2001 -@@ -31,7 +31,7 @@ - INSOWN=@INSTALL@ - INSTDIR=@prefix@/bin - INSTMAN=@prefix@/man --INSTPLUG=@prefix@/lib/xnc -+INSTPLUG=@prefix@/lib - DEB= - STRIPPING= - XINC=@X_CFLAGS@ diff --git a/x11-fm/xnc/files/patch-aa b/x11-fm/xnc/files/patch-aa deleted file mode 100644 index 2f6483978612..000000000000 --- a/x11-fm/xnc/files/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- groups.cxx.orig Wed Apr 25 21:03:06 2001 -+++ groups.cxx Wed Apr 25 21:04:50 2001 -@@ -19,6 +19,7 @@ - #endif - #include - #include -+#include - #include - - void main() diff --git a/x11-fm/xnc/files/patch-ad b/x11-fm/xnc/files/patch-ad index 2f2f2acd274f..ee40b87a3617 100644 --- a/x11-fm/xnc/files/patch-ad +++ b/x11-fm/xnc/files/patch-ad @@ -1,8 +1,8 @@ ---- Makefile.in.orig Wed Apr 25 20:43:09 2001 -+++ Makefile.in Wed Apr 25 20:42:53 2001 -@@ -186,21 +186,21 @@ +--- Makefile.in.orig Sun Jul 29 08:18:38 2001 ++++ Makefile.in Sun Jul 29 08:20:43 2001 +@@ -190,21 +190,21 @@ - install: + install: install-$(PLUGINS) #Installing X Northern Captain... - $(INS) ./users.xnc $(INSTDIR) - $(INS) ./groups.xnc $(INSTDIR) @@ -29,7 +29,7 @@ + $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR) + $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR) + $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR) -+ # /bin/sh ./replace.script - mkdir -p $(INSTPLUG) - $(INS) ./plugins/five/libxncfive.so $(INSTPLUG) - $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG) ++# /bin/sh ./replace.script + @echo "Don't foget run 'xncsetup' before starting XNC" + + diff --git a/x11-fm/xnc/files/patch-ae b/x11-fm/xnc/files/patch-ae deleted file mode 100644 index a56cdb07e7f9..000000000000 --- a/x11-fm/xnc/files/patch-ae +++ /dev/null @@ -1,56 +0,0 @@ ---- image/makefile.in.orig Wed Apr 25 20:12:34 2001 -+++ image/makefile.in Wed Apr 25 20:14:32 2001 -@@ -31,34 +31,34 @@ - all:: libie.a $(PNGDEP) $(ZDEP) - - 24to8.o: 24to8.c -- $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - jpeg.o: jpeg.c -- $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - accel.o: accel.c -- $(CC) -c accel.c $(CXXOPT) $(CXXINCLUDES) -+ $(CC) -c accel.c $(CXXOPT) $(CXXINCLUDES) $(CPPFLAGS) - - pcdr.o: pcdr.c -- $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - inter.o: inter.c -- $(CC) -c inter.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c inter.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - huff.o: huff.c -- $(CC) -c huff.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c huff.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - file.o: file.c -- $(CC) -c file.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c file.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - yuv2rgb.o: yuv2rgb.c -- $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - tiffr.o: tiffr.c -- $(CC) -c tiffr.c $(CXXOPT) $(INCLUDES) -I/usr/local/include -I/usr/include/gr -+ $(CC) -c tiffr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - png.o: png.c -- $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(ZINC) $(PNGINC) -+ $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(ZINC) $(PNGINC) $(CPPFLAGS) - - ../zlib/libz.a: - cd ../zlib && make -@@ -67,7 +67,7 @@ - cd ../libpng && make - - pcxr.o: pcxr.c -- $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES) -+ $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) - - libie.a: $(IOBJS) - $(RM) -f libie.a diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist index 5b3e1b7df82e..fd3d1b875c7d 100644 --- a/x11-fm/xnc/pkg-plist +++ b/x11-fm/xnc/pkg-plist @@ -11,8 +11,8 @@ bin/xnc bin/xncsetup bin/xnlaunch bin/zips.xnc -lib/libxncaqua.so -lib/libxncfive.so +lib/xnc/libxncaqua.so +lib/xnc/libxncfive.so %%PORTDOCS%%share/doc/xnc/doc1.html %%PORTDOCS%%share/doc/xnc/doc2.html %%PORTDOCS%%share/doc/xnc/doc3.html @@ -23,3 +23,4 @@ lib/libxncfive.so %%PORTDOCS%%share/doc/xnc/doc8.html %%PORTDOCS%%share/doc/xnc/index.html %%PORTDOCS%%@dirrm share/doc/xnc +@dirrm lib/xnc -- cgit v1.2.3