On Mon, 18 Oct 2010, Federico G. Schwindt wrote:
> Will try to test tonight/tomorrow.
>
> f.-
New patches attached.
I've Re-added cryptopp patches that are needed by amule and cleaned up
Makefiles and other stuff a bit.
Please test with these and forget the old ones.
Also CCing espie@ who is the current maintainer of these ports...
ciao,
david
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cryptopp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ Makefile 19 Oct 2010 14:58:51 -0000
@@ -5,8 +5,8 @@ CATEGORIES = devel security
HOMEPAGE = http://www.cryptopp.com/
MASTER_SITES = ${HOMEPAGE}
-DISTNAME = cryptopp552
-PKGNAME = cryptopp-5.5.2
+DISTNAME = cryptopp561
+PKGNAME = cryptopp-5.6.1
EXTRACT_SUFX = .zip
WRKDIST = ${WRKDIR}
@@ -19,18 +19,36 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_FTP = Yes
-SHARED_LIBS = cryptopp 0.0
+SHARED_LIBS = cryptopp 1.0
+
+WANTLIB += m stdc++
USE_GMAKE = Yes
-MAKE_FLAGS = CXXFLAGS="-DNDEBUG -pthread ${CXXFLAGS}" PREFIX=${PREFIX} \
+
+# "-Wall" produces a lot of warnings!
+# upstream is aware of this situation
+.ifndef DEBUG
+MAKE_FLAGS += CXXFLAGS="${CXXFLAGS:C/-Wall//}\
+ -fPIC -DCRYPTOPP_DISABLE_SSSE3 -DNDEBUG" \
+ LDFLAGS="-pthread" \
+ PREFIX=${PREFIX} \
LIBcryptopp_VERSION=${LIBcryptopp_VERSION}
-MAKE_FILE = ${WRKDIR}/GNUmakefile
-NO_REGRESS = Yes
+.else
+MAKE_FLAGS += CXXFLAGS="${CXXFLAGS}\
+ -fPIC -DCRYPTOPP_DISABLE_SSSE3" \
+ LDFLAGS="-pthread" \
+ PREFIX=${PREFIX} \
+ LIBcryptopp_VERSION=${LIBcryptopp_VERSION}
+.endif
+MAKE_FILE = ${WRKDIST}/GNUmakefile
+
+REGRESS_FLAGS +=WRKDIST=${WRKDIST}
+REGRESS_TARGET =test
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/cryptopp
- ${INSTALL_DATA} ${WRKDIR}/*.h ${PREFIX}/include/cryptopp
- ${INSTALL_DATA} ${WRKDIR}/libcryptopp.{a,so.${LIBcryptopp_VERSION}} \
+ ${INSTALL_DATA} ${WRKDIST}/*.h ${PREFIX}/include/cryptopp
+ ${INSTALL_DATA} ${WRKDIST}/libcryptopp.{a,so.${LIBcryptopp_VERSION}} \
${PREFIX}/lib
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cryptopp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ distinfo 19 Oct 2010 14:58:51 -0000
@@ -1,5 +1,5 @@
-MD5 (cryptopp552.zip) = qIm+nZrVwgLJJfsQXKpIVw==
-RMD160 (cryptopp552.zip) = iSl5W2VNcYays4cU0ipX6gGGLb0=
-SHA1 (cryptopp552.zip) = GO/kUbPGgvQNt13CsJy0SKg159Y=
-SHA256 (cryptopp552.zip) = B4+N6wM+JhlYK06eRiu6xRJ7De+8/qScNYO+MflAp1k=
-SIZE (cryptopp552.zip) = 992073
+MD5 (cryptopp561.zip) = lsvroJB1YrB34mvP+0g4KA==
+RMD160 (cryptopp561.zip) = qKW4DJlcXU3a+6IoyviGZCUhL78=
+SHA1 (cryptopp561.zip) = Mdu0VsIfUIZSGMV7fq9MlVoiK6E=
+SHA256 (cryptopp561.zip) = mOdNjLF6OAMzVFGayLqcXZim3AC/XR7DxTPC6OyG8mg=
+SIZE (cryptopp561.zip) = 1069703
Index: patches/patch-GNUmakefile
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-GNUmakefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-GNUmakefile
--- patches/patch-GNUmakefile 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-GNUmakefile 19 Oct 2010 14:58:51 -0000
@@ -1,20 +1,153 @@
$OpenBSD: patch-GNUmakefile,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- GNUmakefile.orig Sun Sep 23 21:03:14 2007
-+++ GNUmakefile Sun Jun 15 10:30:30 2008
-@@ -102,7 +102,15 @@ LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
- TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
- DLLTESTOBJS = dlltest.dllonly.o
-
--all: cryptest.exe
-+SHARED_LIB = libcryptopp.so.${LIBcryptopp_VERSION}
-+
-+all: libcryptopp.a ${SHARED_LIB}
-+
-+${SHARED_LIB}: ${LIBOBJS}
-+ $(CXX) -shared -o $@ $(CXXFLAGS) $(LIBOBJS) $(LDFLAGS)
-+
-+regress: cryptest.exe
-+ LD_LIBRARY_PATH=. ./cryptest.exe
-
- clean:
- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+--- GNUmakefile.orig Mon Aug 9 14:22:42 2010
++++ GNUmakefile Tue Oct 19 16:53:19 2010
+@@ -1,4 +1,9 @@
++ifndef CXXFLAGS
+ CXXFLAGS = -DNDEBUG -g -O2
++endif
++ifndef LDFLAGS
++LDFLAGS = -pthread
++endif
+ #CXXFLAGS = -g
+ # -fPIC is supported. Please report any breakage of -fPIC as a bug.
+ # CXXFLAGS += -fPIC
+@@ -9,112 +14,12 @@ ARFLAGS = -cr # ar needs the dash on OpenBSD
+ RANLIB = ranlib
+ CP = cp
+ MKDIR = mkdir
+-EGREP = egrep
+-UNAME = $(shell uname)
+-ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
+
+ # Default prefix for make install
+ ifeq ($(PREFIX),)
+ PREFIX = /usr
+ endif
+
+-ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4
+-CXX = g++
+-endif
+-
+-ifeq ($(ISX86),1)
+-
+-GCC42_OR_LATER = $(shell $(CXX) -v 2>&1 | $(EGREP) -c "^gcc version (4.[2-9]|[5-9])")
+-INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
+-ICC111_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\) ([2-9][0-9]|1[2-9]|11\.[1-9])")
+-IS_SUN_CC = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun")
+-GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
+-GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
+-GAS219_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
+-ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw")
+-
+-ifneq ($(GCC42_OR_LATER),0)
+-ifeq ($(UNAME),Darwin)
+-CXXFLAGS += -arch x86_64 -arch i386
+-else
+-CXXFLAGS += -march=native
+-endif
+-endif
+-
+-ifneq ($(INTEL_COMPILER),0)
+-CXXFLAGS += -wd68 -wd186 -wd279 -wd327
+-ifeq ($(ICC111_OR_LATER),0)
+-# "internal error: backend signals" occurs on some x86 inline assembly with ICC 9 and some x64 inline assembly with ICC 11.0
+-# if you want to use Crypto++'s assembly code with ICC, try enabling it on individual files
+-CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+-endif
+-endif
+-
+-ifeq ($(GAS210_OR_LATER),0) # .intel_syntax wasn't supported until GNU assembler 2.10
+-CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+-else
+-ifeq ($(GAS217_OR_LATER),0)
+-CXXFLAGS += -DCRYPTOPP_DISABLE_SSSE3
+-else
+-ifeq ($(GAS219_OR_LATER),0)
+-CXXFLAGS += -DCRYPTOPP_DISABLE_AESNI
+-endif
+-endif
+-ifeq ($(UNAME),SunOS)
+-CXXFLAGS += -Wa,--divide # allow use of "/" operator
+-endif
+-endif
+-
+-ifeq ($(ISMINGW),1)
+-LDLIBS += -lws2_32
+-endif
+-
+-endif # ISX86
+-
+-ifeq ($(UNAME),) # for DJGPP, where uname doesn't exist
+-CXXFLAGS += -mbnu210
+-else
+-CXXFLAGS += -pipe
+-endif
+-
+-ifeq ($(UNAME),Linux)
+-LDFLAGS += -pthread
+-ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
+-M32OR64 = -m64
+-endif
+-endif
+-
+-ifeq ($(UNAME),Darwin)
+-AR = libtool
+-ARFLAGS = -static -o
+-CXX = c++
+-IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932)
+-ifeq ($(IS_GCC2),1)
+-CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables
+-LDLIBS += -lstdc++
+-LDFLAGS += -flat_namespace -undefined suppress -m
+-endif
+-endif
+-
+-ifeq ($(UNAME),SunOS)
+-LDLIBS += -lnsl -lsocket
+-M32OR64 = -m$(shell isainfo -b)
+-endif
+-
+-ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
+-CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
+-LDFLAGS =
+-AR = $(CXX)
+-ARFLAGS = -xar -o
+-RANLIB = true
+-SUN_CC10_BUGGY = $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: Sun .* 5\.10 .* (2009|2010/0[1-4])")
+-ifneq ($(SUN_CC10_BUGGY),0)
+-# -DCRYPTOPP_INCLUDE_VECTOR_CC is needed for Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 and was fixed in May 2010
+-# remove it if you get "already had a body defined" errors in vector.cc
+-CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
+-endif
+-endif
+-
+ SRCS = $(wildcard *.cpp)
+ ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77
+ SRCS = $(shell echo *.cpp)
+@@ -131,10 +36,15 @@ LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
+ TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
+ DLLTESTOBJS = dlltest.dllonly.o
+
+-all: cryptest.exe
++SHARED_LIB = libcryptopp.so.${LIBcryptopp_VERSION}
+
++all: libcryptopp.a ${SHARED_LIB}
++
++${SHARED_LIB}: ${LIBOBJS}
++ $(CXX) -shared -o $@ $(CXXFLAGS) $(LIBOBJS) $(LDFLAGS)
++
+ test: cryptest.exe
+- ./cryptest.exe v
++ LD_LIBRARY_PATH=${WRKDIST} ./cryptest.exe v
+
+ clean:
+ $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+@@ -154,7 +64,7 @@ libcryptopp.so: $(LIBOBJS)
+ $(CXX) -shared -o $@ $(LIBOBJS)
+
+ cryptest.exe: libcryptopp.a $(TESTOBJS)
+- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
++ $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L${WRKDIST} -lcryptopp $(LDFLAGS) $(LDLIBS)
+
+ nolib: $(OBJS) # makes it faster to test changes
+ $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
Index: patches/patch-algebra_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-algebra_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-algebra_h
--- patches/patch-algebra_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-algebra_h 19 Oct 2010 14:58:51 -0000
@@ -1,22 +1,22 @@
$OpenBSD: patch-algebra_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- algebra.h.orig Wed Jun 18 13:43:58 2008
-+++ algebra.h Fri Jun 20 15:06:45 2008
+--- algebra.h.orig Mon Oct 18 15:28:02 2010
++++ algebra.h Mon Oct 18 15:29:40 2010
@@ -47,7 +47,8 @@ template <class T> class CRYPTOPP_NO_VTABLE AbstractRi
- typedef T Element;
-
- AbstractRing() {m_mg.m_pRing = this;}
-- AbstractRing(const AbstractRing &source) {m_mg.m_pRing = this;}
-+ AbstractRing(const AbstractRing &source): AbstractGroup<T>(source)
-+ {m_mg.m_pRing = this;}
- AbstractRing& operator=(const AbstractRing &source) {return *this;}
-
- virtual bool IsUnit(const Element &a) const =0;
-@@ -120,7 +121,7 @@ struct BaseAndExponent
- {
- public:
- BaseAndExponent() {}
-- BaseAndExponent(const T &base, const E &exponent) : base(base), exponent(exponent) {}
-+ BaseAndExponent(const T &b, const E &e) : base(b), exponent(e) {}
- bool operator<(const BaseAndExponent<T, E> &rhs) const {return exponent < rhs.exponent;}
- T base;
- E exponent;
+ typedef T Element;
+
+ AbstractRing() {m_mg.m_pRing = this;}
+- AbstractRing(const AbstractRing &source) {m_mg.m_pRing = this;}
++ AbstractRing(const AbstractRing &source): AbstractGroup<T>(source)
++ {m_mg.m_pRing = this;}
+ AbstractRing& operator=(const AbstractRing &source) {return *this;}
+
+ virtual bool IsUnit(const Element &a) const =0;
+@@ -120,7 +121,7 @@ struct BaseAndExponent
+ {
+ public:
+ BaseAndExponent() {}
+- BaseAndExponent(const T &base, const E &exponent) : base(base), exponent(exponent) {}
++ BaseAndExponent(const T &b, const E &e) : base(b), exponent(e) {}
+ bool operator<(const BaseAndExponent<T, E> &rhs) const {return exponent < rhs.exponent;}
+ T base;
+ E exponent;
Index: patches/patch-algparam_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-algparam_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-algparam_h
--- patches/patch-algparam_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-algparam_h 19 Oct 2010 14:58:51 -0000
@@ -1,44 +1,44 @@
$OpenBSD: patch-algparam_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- algparam.h.orig Wed Jun 18 13:46:19 2008
-+++ algparam.h Fri Jun 20 15:05:20 2008
-@@ -17,9 +17,9 @@ class ConstByteArrayParameter
(public)
- {
- Assign((const byte *)data, data ? strlen(data) : 0, deepCopy);
- }
-- ConstByteArrayParameter(const byte *data, size_t size, bool deepCopy = false)
-+ ConstByteArrayParameter(const byte *data, size_t sz, bool deepCopy = false)
- {
-- Assign(data, size, deepCopy);
-+ Assign(data, sz, deepCopy);
- }
- template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false)
- {
-@@ -27,14 +27,14 @@ class ConstByteArrayParameter
(public)
- Assign((const byte *)string.data(), string.size(), deepCopy);
- }
-
-- void Assign(const byte *data, size_t size, bool deepCopy)
-+ void Assign(const byte *data, size_t sz, bool deepCopy)
- {
- if (deepCopy)
-- m_block.Assign(data, size);
-+ m_block.Assign(data, sz);
- else
- {
- m_data = data;
-- m_size = size;
-+ m_size = sz;
- }
- m_deepCopy = deepCopy;
- }
-@@ -53,8 +53,8 @@ class ConstByteArrayParameter
(public)
- class ByteArrayParameter
- {
- public:
-- ByteArrayParameter(byte *data = NULL, unsigned int size = 0)
-- : m_data(data), m_size(size) {}
-+ ByteArrayParameter(byte *data = NULL, unsigned int sz = 0)
-+ : m_data(data), m_size(sz) {}
- ByteArrayParameter(SecByteBlock &block)
- : m_data(block.begin()), m_size(block.size()) {}
-
+--- algparam.h.orig Fri Aug 6 18:46:14 2010
++++ algparam.h Mon Oct 18 16:03:37 2010
+@@ -17,9 +17,9 @@ class ConstByteArrayParameter (public)
+ {
+ Assign((const byte *)data, data ? strlen(data) : 0, deepCopy);
+ }
+- ConstByteArrayParameter(const byte *data, size_t size, bool deepCopy = false)
++ ConstByteArrayParameter(const byte *data, size_t sz, bool deepCopy = false)
+ {
+- Assign(data, size, deepCopy);
++ Assign(data, sz, deepCopy);
+ }
+ template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false)
+ {
+@@ -27,14 +27,14 @@ class ConstByteArrayParameter (public)
+ Assign((const byte *)string.data(), string.size(), deepCopy);
+ }
+
+- void Assign(const byte *data, size_t size, bool deepCopy)
++ void Assign(const byte *data, size_t sz, bool deepCopy)
+ {
+ if (deepCopy)
+- m_block.Assign(data, size);
++ m_block.Assign(data, sz);
+ else
+ {
+ m_data = data;
+- m_size = size;
++ m_size = sz;
+ }
+ m_deepCopy = deepCopy;
+ }
+@@ -53,8 +53,8 @@ class ConstByteArrayParameter (public)
+ class ByteArrayParameter
+ {
+ public:
+- ByteArrayParameter(byte *data = NULL, unsigned int size = 0)
+- : m_data(data), m_size(size) {}
++ ByteArrayParameter(byte *data = NULL, unsigned int sz = 0)
++ : m_data(data), m_size(sz) {}
+ ByteArrayParameter(SecByteBlock &block)
+ : m_data(block.begin()), m_size(block.size()) {}
+
Index: patches/patch-config_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-config_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_h
--- patches/patch-config_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-config_h 19 Oct 2010 14:58:51 -0000
@@ -1,12 +1,30 @@
$OpenBSD: patch-config_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- config.h.orig Wed Jun 18 13:40:59 2008
-+++ config.h Wed Jun 18 13:41:28 2008
-@@ -272,7 +272,7 @@ NAMESPACE_END
-
- // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed.
- // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version.
-- #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102)
-+ #if !defined(CRYPTOPP_DISABLE_SSSE3) && (defined(_MSC_VER) && _MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102)
- #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
- #else
- #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
+--- config.h.orig Mon Aug 9 14:22:42 2010
++++ config.h Mon Oct 18 15:52:04 2010
+@@ -268,7 +268,7 @@ NAMESPACE_END
+
+ // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed.
+ // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version.
+- #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102)
++ #if !defined(CRYPTOPP_DISABLE_SSSE3) && (defined(_MSC_VER) && _MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102)
+ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
+ #else
+ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
+@@ -295,7 +295,7 @@ NAMESPACE_END
+ #define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
+ #endif
+
+-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || defined(CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE) && CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
+ #else
+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
+@@ -358,7 +358,7 @@ NAMESPACE_END
+ #define CRYPTOPP_WIN32_AVAILABLE
+ #endif
+
+-#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun)
++#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
+ #define CRYPTOPP_UNIX_AVAILABLE
+ #endif
+
Index: patches/patch-misc_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-misc_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-misc_h
--- patches/patch-misc_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-misc_h 19 Oct 2010 14:58:51 -0000
@@ -1,39 +1,66 @@
$OpenBSD: patch-misc_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- misc.h.orig Wed Jun 18 13:42:22 2008
-+++ misc.h Fri Jun 20 13:36:34 2008
-@@ -146,7 +146,7 @@ retry:
-
- // ************** misc functions ***************
-
--#if (!__STDC_WANT_SECURE_LIB__)
-+#if (!defined(__STDC_WANT_SECURE_LIB__) || !__STDC_WANT_SECURE_LIB__)
- inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
- {
- if (count > sizeInBytes)
-@@ -322,7 +322,7 @@ inline unsigned int GetAlignmentOf(T *dummy=NULL) // V
- return 1; // alignment not needed on x86 and x64
- #endif
-
--#if (_MSC_VER >= 1300)
-+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
- return __alignof(T);
- #elif defined(__GNUC__)
- return __alignof__(T);
-@@ -487,7 +487,7 @@ template<> inline word32 rotrMod<word32>(word32 x, uns
-
- #endif // #ifdef _MSC_VER
-
--#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
-+#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
- // Intel C++ Compiler 10.0 calls a function instead of using the rotate instruction when using these instructions
-
- template<> inline word64 rotlFixed<word64>(word64 x, unsigned int y)
-@@ -526,7 +526,7 @@ template<> inline word64 rotrMod<word64>(word64 x, uns
-
- #endif // #if _MSC_VER >= 1310
-
--#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
-+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
- // Intel C++ Compiler 10.0 gives undefined externals with these
-
- template<> inline word16 rotlFixed<word16>(word16 x, unsigned int y)
+--- misc.h.orig Fri Aug 6 18:46:18 2010
++++ misc.h Tue Oct 19 09:14:36 2010
+@@ -141,7 +141,7 @@ const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOIN
+
+ // ************** misc functions ***************
+
+-#if (!__STDC_WANT_SECURE_LIB__)
++#if (!defined(__STDC_WANT_SECURE_LIB__) || !__STDC_WANT_SECURE_LIB__)
+ inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
+ {
+ if (count > sizeInBytes)
+@@ -156,7 +156,7 @@ inline void memmove_s(void *dest, size_t sizeInBytes,
+ memmove(dest, src, count);
+ }
+
+-#if __BORLANDC__ >= 0x620
++#if defined(__BORLANDC__) && __BORLANDC__ >= 0x620
+ // C++Builder 2010 workaround: can't use std::memcpy_s because it doesn't allow 0 lengths
+ #define memcpy_s CryptoPP::memcpy_s
+ #define memmove_s CryptoPP::memmove_s
+@@ -367,7 +367,7 @@ inline unsigned int GetAlignmentOf(T *dummy=NULL) // V
+ return 1;
+ #endif
+
+-#if (_MSC_VER >= 1300)
++#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+ return __alignof(T);
+ #elif defined(__GNUC__)
+ return __alignof__(T);
+@@ -483,7 +483,7 @@ void SecureWipeBuffer(T *buf, size_t n)
+ *(--p) = 0;
+ }
+
+-#if (_MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86)
++#if (defined(_MSC_VER) && _MSC_VER >= 1400 || defined(__GNUC__)) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86)
+
+ template<> inline void SecureWipeBuffer(byte *buf, size_t n)
+ {
+@@ -651,7 +651,7 @@ template<> inline word32 rotrMod<word32>(word32 x, uns
+
+ #endif // #ifdef _MSC_VER
+
+-#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
++#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
+ // Intel C++ Compiler 10.0 calls a function instead of using the rotate instruction when using these instructions
+
+ template<> inline word64 rotlFixed<word64>(word64 x, unsigned int y)
+@@ -690,7 +690,7 @@ template<> inline word64 rotrMod<word64>(word64 x, uns
+
+ #endif // #if _MSC_VER >= 1310
+
+-#if _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
++#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(__INTEL_COMPILER)
+ // Intel C++ Compiler 10.0 gives undefined externals with these
+
+ template<> inline word16 rotlFixed<word16>(word16 x, unsigned int y)
+@@ -837,7 +837,7 @@ inline word32 ByteReverse(word32 value)
+ return bswap_32(value);
+ #elif defined(__MWERKS__) && TARGET_CPU_PPC
+ return (word32)__lwbrx(&value,0);
+-#elif _MSC_VER >= 1400 || (_MSC_VER >= 1300 && !defined(_DLL))
++#elif defined(_MSC_VER) && (_MSC_VER >= 1400 || _MSC_VER >= 1300 && !defined(_DLL))
+ return _byteswap_ulong(value);
+ #elif CRYPTOPP_FAST_ROTATE(32)
+ // 5 instructions with rotate instruction, 9 without
Index: patches/patch-modarith_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-modarith_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-modarith_h
--- patches/patch-modarith_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-modarith_h 19 Oct 2010 14:58:51 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-modarith_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- modarith.h.orig Wed Jun 18 13:44:33 2008
-+++ modarith.h Fri Jun 20 13:58:36 2008
+--- modarith.h.orig Mon Oct 18 15:40:16 2010
++++ modarith.h Mon Oct 18 15:41:26 2010
@@ -27,7 +27,7 @@ class CRYPTOPP_DLL ModularArithmetic : public Abstract
- : m_modulus(modulus), m_result((word)0, modulus.reg.size()) {}
-
- ModularArithmetic(const ModularArithmetic &ma)
-- : m_modulus(ma.m_modulus), m_result((word)0, m_modulus.reg.size()) {}
-+ : AbstractRing<Integer>(ma), m_modulus(ma.m_modulus), m_result((word)0, m_modulus.reg.size()) {}
-
- ModularArithmetic(BufferedTransformation &bt); // construct from BER encoded parameters
-
+ : m_modulus(modulus), m_result((word)0, modulus.reg.size()) {}
+
+ ModularArithmetic(const ModularArithmetic &ma)
+- : m_modulus(ma.m_modulus), m_result((word)0, m_modulus.reg.size()) {}
++ : AbstractRing<Integer>(ma), m_modulus(ma.m_modulus), m_result((word)0, m_modulus.reg.size()) {}
+
+ ModularArithmetic(BufferedTransformation &bt); // construct from BER encoded parameters
+
Index: patches/patch-osrng_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-osrng_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-osrng_h
--- patches/patch-osrng_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-osrng_h 19 Oct 2010 14:58:51 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-osrng_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- osrng.h.orig Fri Jun 20 14:58:43 2008
-+++ osrng.h Fri Jun 20 15:01:52 2008
-@@ -140,7 +140,7 @@ void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(bool bloc
-
- CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG<AES>;
-
--#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
-+#if defined(CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2) && CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
- typedef AutoSeededX917RNG<AES> DefaultAutoSeededRNG;
- #else
- typedef AutoSeededRandomPool DefaultAutoSeededRNG;
+--- osrng.h.orig Mon Oct 18 15:42:30 2010
++++ osrng.h Mon Oct 18 15:43:01 2010
+@@ -143,7 +143,7 @@ void AutoSeededX917RNG<BLOCK_CIPHER>::Reseed(bool bloc
+ CRYPTOPP_DLL_TEMPLATE_CLASS AutoSeededX917RNG<AES>;
+
+ //! this is AutoSeededX917RNG\<AES\> in FIPS mode, otherwise it's AutoSeededRandomPool
+-#if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
++#if defined(CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2) && CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2
+ typedef AutoSeededX917RNG<AES> DefaultAutoSeededRNG;
+ #else
+ typedef AutoSeededRandomPool DefaultAutoSeededRNG;
Index: patches/patch-secblock_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-secblock_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-secblock_h
--- patches/patch-secblock_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-secblock_h 19 Oct 2010 14:58:51 -0000
@@ -1,23 +1,23 @@
$OpenBSD: patch-secblock_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- secblock.h.orig Wed Jun 18 13:43:26 2008
-+++ secblock.h Wed Jun 18 13:43:49 2008
-@@ -156,7 +156,7 @@ class AllocatorWithCleanup : public AllocatorBase<T>
- // VS.NET STL enforces the policy of "All STL-compliant allocators have to provide a
- // template class member called rebind".
- template <class U> struct rebind { typedef AllocatorWithCleanup<U, T_Align16> other; };
--#if _MSC_VER >= 1500
-+#if defined(_MSC_VER) && _MSC_VER >= 1500
- AllocatorWithCleanup() {}
- template <class U, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<U, A> &) {}
- #endif
-@@ -279,8 +279,8 @@ class SecBlock
(public)
- typedef typename A::const_pointer const_iterator;
- typedef typename A::size_type size_type;
-
-- explicit SecBlock(size_type size=0)
-- : m_size(size) {m_ptr = m_alloc.allocate(size, NULL);}
-+ explicit SecBlock(size_type sz=0)
-+ : m_size(sz) {m_ptr = m_alloc.allocate(sz, NULL);}
- SecBlock(const SecBlock<T, A> &t)
- : m_size(t.m_size) {m_ptr = m_alloc.allocate(m_size, NULL); memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));}
- SecBlock(const T *t, size_type len)
+--- secblock.h.orig Mon Oct 18 15:44:11 2010
++++ secblock.h Mon Oct 18 15:45:36 2010
+@@ -120,7 +120,7 @@ class AllocatorWithCleanup : public AllocatorBase<T> (
+ // VS.NET STL enforces the policy of "All STL-compliant allocators have to provide a
+ // template class member called rebind".
+ template <class U> struct rebind { typedef AllocatorWithCleanup<U, T_Align16> other; };
+-#if _MSC_VER >= 1500
++#if defined(_MSC_VER) && _MSC_VER >= 1500
+ AllocatorWithCleanup() {}
+ template <class U, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<U, A> &) {}
+ #endif
+@@ -243,8 +243,8 @@ class SecBlock (public)
+ typedef typename A::const_pointer const_iterator;
+ typedef typename A::size_type size_type;
+
+- explicit SecBlock(size_type size=0)
+- : m_size(size) {m_ptr = m_alloc.allocate(size, NULL);}
++ explicit SecBlock(size_type sz=0)
++ : m_size(sz) {m_ptr = m_alloc.allocate(sz, NULL);}
+ SecBlock(const SecBlock<T, A> &t)
+ : m_size(t.m_size) {m_ptr = m_alloc.allocate(m_size, NULL); memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));}
+ SecBlock(const T *t, size_type len)
Index: patches/patch-smartptr_h
===================================================================
RCS file: /cvs/ports/devel/cryptopp/patches/patch-smartptr_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-smartptr_h
--- patches/patch-smartptr_h 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ patches/patch-smartptr_h 19 Oct 2010 14:58:51 -0000
@@ -1,14 +1,14 @@
$OpenBSD: patch-smartptr_h,v 1.1.1.1 2008/08/26 14:57:58 espie Exp $
---- smartptr.h.orig Wed Jun 18 13:41:43 2008
-+++ smartptr.h Wed Jun 18 13:42:09 2008
+--- smartptr.h.orig Mon Oct 18 15:47:44 2010
++++ smartptr.h Mon Oct 18 15:48:19 2010
@@ -189,8 +189,8 @@ template <class T> counted_ptr<T> & counted_ptr<T>::op
- template <class T> class vector_member_ptrs
- {
- public:
-- vector_member_ptrs(size_t size=0)
-- : m_size(size), m_ptr(new member_ptr<T>[size]) {}
-+ vector_member_ptrs(size_t sz=0)
-+ : m_size(sz), m_ptr(new member_ptr<T>[sz]) {}
- ~vector_member_ptrs()
- {delete [] this->m_ptr;}
-
+ template <class T> class vector_member_ptrs
+ {
+ public:
+- vector_member_ptrs(size_t size=0)
+- : m_size(size), m_ptr(new member_ptr<T>[size]) {}
++ vector_member_ptrs(size_t sz=0)
++ : m_size(sz), m_ptr(new member_ptr<T>[sz]) {}
+ ~vector_member_ptrs()
+ {delete [] this->m_ptr;}
+
Index: patches/patch-stdcpp_h
===================================================================
RCS file: patches/patch-stdcpp_h
diff -N patches/patch-stdcpp_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-stdcpp_h 19 Oct 2010 14:58:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- stdcpp.h.orig Mon Oct 18 15:52:08 2010
++++ stdcpp.h Mon Oct 18 15:52:33 2010
+@@ -1,7 +1,7 @@
+ #ifndef CRYPTOPP_STDCPP_H
+ #define CRYPTOPP_STDCPP_H
+
+-#if _MSC_VER >= 1500
++#if defined(_MSC_VER) && _MSC_VER >= 1500
+ #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
+ #include <intrin.h>
+ #endif
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/cryptopp/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ pkg/DESCR 19 Oct 2010 14:58:51 -0000
@@ -1,5 +1,5 @@
Yet another library of cryptographic functions, this one in C++.
-All code is public domain, except the mars implementation.
-
-This is a dependency of current amule, otherwise it wouldn't even be
-there.
+One purpose of Crypto++ is to act as a repository of public domain
+(not copyrighted) source code. Although the library is copyrighted
+as a compilation, the individual files in it (except for a few
+exceptions listed in the license) are in the public domain.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/cryptopp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 Aug 2008 14:57:58 -0000 1.1.1.1
+++ pkg/PLIST 19 Oct 2010 14:58:51 -0000
@@ -9,6 +9,7 @@ include/cryptopp/algparam.h
include/cryptopp/arc4.h
include/cryptopp/argnames.h
include/cryptopp/asn.h
+include/cryptopp/authenc.h
include/cryptopp/base32.h
include/cryptopp/base64.h
include/cryptopp/basecode.h
@@ -18,7 +19,9 @@ include/cryptopp/blumshub.h
include/cryptopp/camellia.h
include/cryptopp/cast.h
include/cryptopp/cbcmac.h
+include/cryptopp/ccm.h
include/cryptopp/channels.h
+include/cryptopp/cmac.h
include/cryptopp/config.h
include/cryptopp/cpu.h
include/cryptopp/crc.h
@@ -30,6 +33,7 @@ include/cryptopp/dh2.h
include/cryptopp/dll.h
include/cryptopp/dmac.h
include/cryptopp/dsa.h
+include/cryptopp/eax.h
include/cryptopp/ec2n.h
include/cryptopp/eccrypto.h
include/cryptopp/ecp.h
@@ -42,6 +46,7 @@ include/cryptopp/files.h
include/cryptopp/filters.h
include/cryptopp/fips140.h
include/cryptopp/fltrimpl.h
+include/cryptopp/gcm.h
include/cryptopp/gf256.h
include/cryptopp/gf2_32.h
include/cryptopp/gf2n.h
@@ -98,6 +103,7 @@ include/cryptopp/salsa.h
include/cryptopp/seal.h
include/cryptopp/secblock.h
include/cryptopp/seckey.h
+include/cryptopp/seed.h
include/cryptopp/serpent.h
include/cryptopp/serpentp.h
include/cryptopp/sha.h
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/amule/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 12 Jul 2010 22:07:37 -0000 1.16
+++ Makefile 19 Oct 2010 15:04:05 -0000
@@ -1,16 +1,18 @@
# $OpenBSD: Makefile,v 1.16 2010/07/12 22:07:37 sthen Exp $
+# untested on gcc3 archs
+ONLY_FOR_ARCHS =${GCC4_ARCHS}
+
COMMENT-main = another eMule p2p client
COMMENT-web = webserver interface to amuled
COMMENT-daemon =stand-alone daemon/cmdline for amule
-V = 2.1.3
+V = 2.2.6
DISTNAME = aMule-$V
CATEGORIES = net
HOMEPAGE = http://www.amule.org/
MULTI_PACKAGES =-main -web -daemon
-REVISION-main = 5
PKGNAME-main = amule-$V
PKGNAME-daemon =amuled-$V
PKGNAME-web = amuleweb-$V
@@ -25,28 +27,41 @@ MAINTAINER = Marc Espie <es...@openbsd.o
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX = .tar.bz2
+WRKDIST = ${WRKDIR}/${DISTNAME}
+
RUN_DEPENDS-main=${RUN_DEPENDS} \
:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS = wx_base_net,wx_base:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
-WANTLIB = c m pthread z stdc++
+LIB_DEPENDS = ::x11/wxWidgets \
+ ::devel/cryptopp \
+ ::devel/libexecinfo \
+ ::graphics/gd \
+ ::net/libupnp
+
+WANTLIB = c execinfo gd ixml m pthread stdc++ threadutil \
+ upnp wx_base wx_base_net z
+WANTLIB-main = ${WANTLIB} X11 cryptopp wx_gtk2_adv wx_gtk2_core
+WANTLIB-daemon = ${WANTLIB} cryptopp readline termcap
+WANTLIB-web = ${WANTLIB} png readline termcap
USE_X11 = Yes
USE_GMAKE = Yes
-WANTLIB-main = ${WANTLIB} X11 pthread-stubs wx_gtk2_adv wx_gtk2_core xcb
-WANTLIB-daemon =${WANTLIB} readline termcap
-WANTLIB-web = ${WANTLIB} png readline termcap
-
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-debug \
--with-x \
--enable-amule-daemon \
--enable-amulecmd \
--enable-webserver \
- --enable-amule-gui
+ --enable-amule-gui \
+ --enable-alc \
+ --enable-alcc \
+ --enable-cas \
+ --enable-wxcas \
+ --with-denoise-level=0
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -lexecinfo -lm"
post-install:
${INSTALL_SCRIPT} ${WRKDIST}/src/utils/scripts/mldonkey_importer.pl \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/amule/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:07 -0000 1.4
+++ distinfo 19 Oct 2010 15:04:05 -0000
@@ -1,5 +1,5 @@
-MD5 (aMule-2.1.3.tar.bz2) = Cq/dFZ7bitXwBk2oeZi0fQ==
-RMD160 (aMule-2.1.3.tar.bz2) = /MNFAA5a0KIh0eltDVFPO+NkKMM=
-SHA1 (aMule-2.1.3.tar.bz2) = 3Ufes456W4I1ULhRUPWoFMWXsnM=
-SHA256 (aMule-2.1.3.tar.bz2) = bpfpR7t6wjG3XjshpQmi7AI5vNfp2/xgYsUgptE7AkQ=
-SIZE (aMule-2.1.3.tar.bz2) = 3248530
+MD5 (aMule-2.2.6.tar.bz2) = Uw2bSBh+NvePwhuxnpQybQ==
+RMD160 (aMule-2.2.6.tar.bz2) = lIPrGQeAPTpqw3XE2Fp7DL2JXao=
+SHA1 (aMule-2.2.6.tar.bz2) = Npu5UIl8Px9Z/BGQrHA0ETrCU9A=
+SHA256 (aMule-2.2.6.tar.bz2) = bOMrXx2BE6IkqOhQY52VdlZiOgSnP7g9UjE8BsNIgSI=
+SIZE (aMule-2.2.6.tar.bz2) = 4722143
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 19 Oct 2010 15:04:05 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- configure.orig Wed Sep 16 23:03:09 2009
++++ configure Mon Oct 11 12:09:55 2010
+@@ -1954,8 +1954,8 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\
+ ;;
+ openbsd*)
+ SYS=openbsd
+- LIBS="$LIBS -L/usr/local/lib"
+- X11LIBS="-lX11 -L/usr/X11R6/lib"
++ LIBS="$LIBS -L${LOCALBASE}/lib"
++ X11LIBS="-lX11 -L${X11BASE}/lib"
+ MULECPPFLAGS="-D__OPENBSD__"
+ ;;
+ *cygwin* | *mingw32*)
+@@ -1990,7 +1990,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\
+
+ echo "$as_me:$LINENO: checking if this is a FreeBSD 4 or earlier system" >&5
+ echo $ECHO_N "checking if this is a FreeBSD 4 or earlier system... $ECHO_C" >&6
+- if test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5; then
++ if test x"`uname -s`" = xOpenBSD; then
+
+ MULELDFLAGS="$MULELDFLAGS -pthread"
+ echo "$as_me:$LINENO: result: yes" >&5
+@@ -18694,7 +18694,7 @@ echo "${ECHO_T}${enableval:-no}" >&6
+ echo "$as_me:$LINENO: checking for docdir" >&5
+ echo $ECHO_N "checking for docdir... $ECHO_C" >&6
+ if test -z "$docdir"; then
+- docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
++ docdir="${prefix}/share/doc/amule"
+ fi
+
+ echo "$as_me:$LINENO: result: $docdir" >&5
Index: patches/patch-docs_Makefile_in
===================================================================
RCS file: patches/patch-docs_Makefile_in
diff -N patches/patch-docs_Makefile_in
--- patches/patch-docs_Makefile_in 12 Oct 2006 14:18:53 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_Makefile_in,v 1.3 2006/10/12 14:18:53 alek Exp $
---- docs/Makefile.in.orig Sun Jun 11 17:08:56 2006
-+++ docs/Makefile.in Fri Oct 6 18:41:36 2006
-@@ -253,7 +253,7 @@ ccache_prefix = @ccache_prefix@
- crypto_prefix = @crypto_prefix@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-+docdir = $(datadir)/doc/amule
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
Index: patches/patch-src_FileLock_h
===================================================================
RCS file: patches/patch-src_FileLock_h
diff -N patches/patch-src_FileLock_h
--- patches/patch-src_FileLock_h 12 Oct 2006 14:18:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_FileLock_h,v 1.1 2006/10/12 14:18:53 alek Exp $
---- src/FileLock.h.orig Fri Oct 6 19:28:24 2006
-+++ src/FileLock.h Fri Oct 6 19:28:28 2006
-@@ -31,7 +31,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <cerrno>
--
-+#include <unistd.h>
-
- /**
- * This class provides an easy way to lock non-critical
Index: patches/patch-src_MuleGifCtrl_cpp
===================================================================
RCS file: patches/patch-src_MuleGifCtrl_cpp
diff -N patches/patch-src_MuleGifCtrl_cpp
--- patches/patch-src_MuleGifCtrl_cpp 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@
-$OpenBSD: patch-src_MuleGifCtrl_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/MuleGifCtrl.cpp.orig Fri Feb 3 20:14:05 2006
-+++ src/MuleGifCtrl.cpp Wed Oct 10 17:53:08 2007
-@@ -24,7 +24,6 @@
-
- #include <wx/mstream.h>
- #include <wx/gifdecod.h>
--#include <wx/window.h>
- #include <wx/dcbuffer.h>
-
- #include "MuleGifCtrl.h"
-@@ -35,7 +34,51 @@ BEGIN_EVENT_TABLE(MuleGifCtrl, wxControl)
- EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
- END_EVENT_TABLE()
-
-+#if wxCHECK_VERSION(2, 7, 1)
-+// Wrapper that emulates old wxGIFDecoder API
-
-+class MuleGIFDecoder : public wxGIFDecoder {
-+public:
-+ MuleGIFDecoder(wxInputStream* stream, bool dummy) {
-+ m_stream = stream;
-+ dummy = dummy; // Unused.
-+ m_nframe = 0;
-+ }
-+
-+ ~MuleGIFDecoder() { /* don't delete the stream! */ }
-+
-+ wxGIFErrorCode ReadGIF() {
-+ return LoadGIF(*m_stream);
-+ }
-+
-+ void GoFirstFrame() { m_nframe = 0; }
-+ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
-+ void GoLastFrame() { m_nframe = GetFrameCount(); }
-+
-+ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
-+
-+ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
-+ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
-+
-+ size_t GetLeft() { return 0; }
-+ size_t GetTop() { return 0; }
-+
-+ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
-+
-+private:
-+ uint32_t m_nframe;
-+ wxInputStream* m_stream;
-+};
-+
-+#else
-+class MuleGIFDecoder : public wxGIFDecoder {
-+public:
-+ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
-+};
-+#endif
-+
-+
-+
- MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style, const wxValidator& validator,
- const wxString& name )
-@@ -66,7 +109,7 @@ bool MuleGifCtrl::LoadData(const char* data, int size)
- }
-
- wxMemoryInputStream stream(data, size);
-- m_decoder = new wxGIFDecoder(&stream, TRUE);
-+ m_decoder = new MuleGIFDecoder(&stream, TRUE);
- if ( m_decoder->ReadGIF() != wxGIF_OK ) {
- delete m_decoder;
- m_decoder = NULL;
-@@ -137,3 +180,4 @@ void MuleGifCtrl::OnPaint( wxPaintEvent& WXUNUSED(even
- dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
- }
-
-+// File_checked_for_headers
Index: patches/patch-src_MuleGifCtrl_h
===================================================================
RCS file: patches/patch-src_MuleGifCtrl_h
diff -N patches/patch-src_MuleGifCtrl_h
--- patches/patch-src_MuleGifCtrl_h 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_MuleGifCtrl_h,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/MuleGifCtrl.h.orig Sun Jan 1 06:17:25 2006
-+++ src/MuleGifCtrl.h Wed Oct 10 17:53:08 2007
-@@ -27,11 +27,10 @@
-
- #include <wx/control.h>
- #include <wx/timer.h>
--#include <wx/bitmap.h>
-
- const int GIFTIMERID = 271283;
-
--class wxGIFDecoder;
-+class MuleGIFDecoder;
- class wxBitmap;
-
- /**
-@@ -121,7 +120,7 @@ class MuleGifCtrl : public wxControl (private)
- void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
-
- //! A pointer to the current gif-animation.
-- wxGIFDecoder* m_decoder;
-+ MuleGIFDecoder* m_decoder;
- //! Timer used for the delay between each frame.
- wxTimer m_timer;
- //! Current frame.
-@@ -133,3 +132,4 @@ class MuleGifCtrl : public wxControl (private)
-
- #endif
-
-+// File_checked_for_headers
Index: patches/patch-src_MuleTextCtrl_cpp
===================================================================
RCS file: patches/patch-src_MuleTextCtrl_cpp
diff -N patches/patch-src_MuleTextCtrl_cpp
--- patches/patch-src_MuleTextCtrl_cpp 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_MuleTextCtrl_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/MuleTextCtrl.cpp.orig Sun Jan 1 06:17:25 2006
-+++ src/MuleTextCtrl.cpp Wed Oct 10 17:53:08 2007
-@@ -26,6 +26,7 @@
- #include <wx/menu.h>
- #include <wx/intl.h>
- #include <wx/clipbrd.h>
-+#include <wx/dataobj.h>
-
- /**
- * These are the IDs used to identify the different menu-items.
Index: patches/patch-src_StatTree_h
===================================================================
RCS file: patches/patch-src_StatTree_h
diff -N patches/patch-src_StatTree_h
--- patches/patch-src_StatTree_h 8 Jul 2007 18:09:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_StatTree_h,v 1.1 2007/07/08 18:09:58 espie Exp $
---- src/StatTree.h.orig Tue Jun 26 12:52:37 2007
-+++ src/StatTree.h Tue Jun 26 12:53:48 2007
-@@ -38,22 +38,7 @@
-
- #ifndef EC_REMOTE // CLIENT_GUI
-
--// Try to determine sizeof(int)
--#if defined(__INT_MAX__) && defined(__LONG_MAX__)
-- #if __INT_MAX__ != __LONG_MAX__
-- #define USE_64BIT_ARCH
-- #endif
--#else
-- // #include <bits/wordsize.h> would be enough, but we shouldn't depend on
-- // non-standard includes. However, we still do it :)
-- #include <stdint.h>
-- #ifdef __WORDSIZE
-- #if __WORDSIZE == 64
-- #define USE_64BIT_ARCH
-- #endif
-- #endif
--#endif
--// If we cannot determine wordsize, assume that we use 32bit arch.
-+#define USE_64BIT_ARCH
-
- #define VIRTUAL virtual
-
Index: patches/patch-src_amule_cpp
===================================================================
RCS file: patches/patch-src_amule_cpp
diff -N patches/patch-src_amule_cpp
--- patches/patch-src_amule_cpp 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_amule_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/amule.cpp.orig Fri Apr 21 05:13:51 2006
-+++ src/amule.cpp Wed Oct 10 17:53:08 2007
-@@ -97,6 +97,7 @@
- #include <CoreFoundation/CFBundle.h>
- #include <wx/mac/corefoundation/cfstring.h>
- #endif
-+ #include <wx/msgdlg.h>
- #endif
-
-
Index: patches/patch-src_utils_wxCas_src_wxcasprefs_cpp
===================================================================
RCS file: patches/patch-src_utils_wxCas_src_wxcasprefs_cpp
diff -N patches/patch-src_utils_wxCas_src_wxcasprefs_cpp
--- patches/patch-src_utils_wxCas_src_wxcasprefs_cpp 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_utils_wxCas_src_wxcasprefs_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/utils/wxCas/src/wxcasprefs.cpp.orig Fri Dec 16 13:09:29 2005
-+++ src/utils/wxCas/src/wxcasprefs.cpp Wed Oct 10 17:53:08 2007
-@@ -297,7 +297,7 @@ WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialo
- m_validateButton =
- new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
- m_cancelButton =
-- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
-+ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
-
- m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
- m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
-@@ -321,7 +321,6 @@ BEGIN_EVENT_TABLE ( WxCasPrefs, wxDialog )
- EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
- EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
- EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
--EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog
- EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
- EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
- END_EVENT_TABLE ()
Index: patches/patch-src_utils_wxCas_src_wxcasprefs_h
===================================================================
RCS file: patches/patch-src_utils_wxCas_src_wxcasprefs_h
diff -N patches/patch-src_utils_wxCas_src_wxcasprefs_h
--- patches/patch-src_utils_wxCas_src_wxcasprefs_h 26 Oct 2007 15:00:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_utils_wxCas_src_wxcasprefs_h,v 1.1 2007/10/26 15:00:39 steven Exp $
---- src/utils/wxCas/src/wxcasprefs.h.orig Fri Dec 16 13:09:29 2005
-+++ src/utils/wxCas/src/wxcasprefs.h Wed Oct 10 17:53:08 2007
-@@ -101,8 +101,7 @@ class WxCasPrefs: public wxDialog (private)
- ID_AUTOSTATIMG_COMBO,
- ID_AUTOSTATIMG_BROWSE_BUTTON,
- ID_FTP_UPDATE_CHECK,
-- ID_VALIDATE_BUTTON,
-- ID_CANCEL_BUTTON
-+ ID_VALIDATE_BUTTON
- };
-
- protected:
Index: pkg/PLIST-daemon
===================================================================
RCS file: /cvs/ports/net/amule/pkg/PLIST-daemon,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-daemon
--- pkg/PLIST-daemon 8 Jul 2007 18:09:58 -0000 1.1
+++ pkg/PLIST-daemon 19 Oct 2010 15:04:05 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-daemon,v 1.1 2007/07/08 18:09:58 espie Exp $
-bin/amulecmd
-bin/amuled
+...@bin bin/amulecmd
+...@bin bin/amuled
@man man/man1/amulecmd.1
@man man/man1/amuled.1
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/amule/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 22 Dec 2009 00:31:22 -0000 1.4
+++ pkg/PLIST-main 19 Oct 2010 15:04:05 -0000
@@ -1,30 +1,57 @@
@comment $OpenBSD: PLIST-main,v 1.4 2009/12/22 00:31:22 sthen Exp $
@pkgpath net/amule
-bin/amule
-bin/amulegui
-bin/ed2k
+...@bin bin/alc
+...@bin bin/alcc
+...@bin bin/amule
+...@bin bin/amulegui
+...@comment bin/autostart-xas
+...@bin bin/cas
+...@bin bin/ed2k
bin/mldonkey_importer
+...@bin bin/wxcas
@comment lib/xchat/
@comment lib/xchat/plugins/
@comment lib/xchat/plugins/xas.pl
@comment man/de/
@comment man/de/man1/
+...@comment @man man/de/man1/alc.1
+...@comment @man man/de/man1/alcc.1
@comment @man man/de/man1/amule.1
@comment @man man/de/man1/amulecmd.1
@comment @man man/de/man1/amuled.1
+...@comment @man man/de/man1/amulegui.1
@comment @man man/de/man1/amuleweb.1
+...@comment @man man/de/man1/cas.1
@comment @man man/de/man1/ed2k.1
+...@comment @man man/de/man1/wxcas.1
@comment @man man/de/man1/xas.1
@comment man/es/
@comment man/es/man1/
+...@comment @man man/es/man1/alc.1
+...@comment @man man/es/man1/alcc.1
@comment @man man/es/man1/amule.1
@comment @man man/es/man1/amulecmd.1
@comment @man man/es/man1/amuled.1
@comment @man man/es/man1/amuleweb.1
+...@comment @man man/es/man1/cas.1
@comment @man man/es/man1/ed2k.1
+...@comment @man man/es/man1/wxcas.1
@comment @man man/es/man1/xas.1
+...@comment man/eu/
+...@comment man/eu/man1/
+...@comment @man man/eu/man1/alc.1
+...@comment @man man/eu/man1/alcc.1
+...@comment @man man/eu/man1/amule.1
+...@comment @man man/eu/man1/amulecmd.1
+...@comment @man man/eu/man1/amuled.1
+...@comment @man man/eu/man1/amuleweb.1
+...@comment @man man/eu/man1/cas.1
+...@comment @man man/eu/man1/ed2k.1
+...@comment @man man/eu/man1/wxcas.1
+...@comment @man man/eu/man1/xas.1
@comment man/fr/
@comment man/fr/man1/
+...@comment @man man/fr/man1/alcc.1
@comment @man man/fr/man1/amule.1
@comment @man man/fr/man1/amulecmd.1
@comment @man man/fr/man1/amuled.1
@@ -32,21 +59,50 @@ bin/mldonkey_importer
@comment @man man/fr/man1/ed2k.1
@comment man/hu/
@comment man/hu/man1/
+...@comment @man man/hu/man1/alc.1
+...@comment @man man/hu/man1/alcc.1
@comment @man man/hu/man1/amule.1
@comment @man man/hu/man1/amulecmd.1
@comment @man man/hu/man1/amuled.1
@comment @man man/hu/man1/amuleweb.1
+...@comment @man man/hu/man1/cas.1
@comment @man man/hu/man1/ed2k.1
+...@comment @man man/hu/man1/wxcas.1
@comment @man man/hu/man1/xas.1
+...@comment man/it/
+...@comment man/it/man1/
+...@comment @man man/it/man1/amule.1
+...@comment @man man/it/man1/amulecmd.1
+...@comment @man man/it/man1/amuled.1
+...@comment @man man/it/man1/amulegui.1
+...@comment @man man/it/man1/amuleweb.1
+...@comment @man man/it/man1/ed2k.1
+...@man man/man1/alc.1
+...@man man/man1/alcc.1
@man man/man1/amule.1
+...@man man/man1/amulegui.1
+...@man man/man1/cas.1
@man man/man1/ed2k.1
+...@man man/man1/wxcas.1
@comment @man man/man1/xas.1
+share/amule/
+share/amule/skins/
+share/amule/skins/gnome.zip
+share/amule/skins/kde4.zip
+share/amule/skins/tango.zip
+share/amule/skins/xfce.zip
share/applications/
+share/applications/alc.desktop
share/applications/amule.desktop
+share/applications/amulegui.desktop
+share/applications/wxcas.desktop
+share/cas/
+share/cas/stat.png
+share/cas/tmp.html
share/doc/amule/
+...@comment share/doc/amule/Doxyfile
@comment share/doc/amule/ABOUT-NLS
@comment share/doc/amule/Changelog
-...@comment share/doc/amule/Doxyfile
@comment share/doc/amule/EC_Protocol.txt
share/doc/amule/ED2K-Links.HOWTO
@comment share/doc/amule/INSTALL
@@ -56,89 +112,64 @@ share/doc/amule/README
share/doc/amule/amulesig.txt
share/doc/amule/license.txt
@comment share/doc/amule/socks4.protocol
-share/locale/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/amule.mo
-share/locale/bg/
-share/locale/bg/LC_MESSAGES/
+share/locale/ast/
+share/locale/ast/LC_MESSAGES/
+share/locale/ast/LC_MESSAGES/amule.mo
share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/amule.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
+share/locale/cs/LC_MESSAGES/amule.mo
share/locale/da/LC_MESSAGES/amule.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/amule.mo
+share/locale/el/LC_MESSAGES/amule.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/amule.mo
-share/locale/en_US/
-share/locale/en_US/LC_MESSAGES/
-share/locale/en_US/LC_MESSAGES/amule.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/amule.mo
-share/locale/es_MX/
-share/locale/es_MX/LC_MESSAGES/
-share/locale/es_MX/LC_MESSAGES/amule.mo
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/amule.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/amule.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/gl/
-share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/hr/
-share/locale/hr/LC_MESSAGES/
+share/locale/he/LC_MESSAGES/amule.mo
share/locale/hr/LC_MESSAGES/amule.mo
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/amule.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/amule.mo
share/locale/it_CH/
share/locale/it_CH/LC_MESSAGES/
share/locale/it_CH/LC_MESSAGES/amule.mo
+share/locale/ja/LC_MESSAGES/amule.mo
share/locale/ko_KR/
share/locale/ko_KR/LC_MESSAGES/
share/locale/ko_KR/LC_MESSAGES/amule.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/amule.mo
share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
+share/locale/nn/LC_MESSAGES/amule.mo
share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/amule.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/amule.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/amule.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
+share/locale/sq/
+share/locale/sq/LC_MESSAGES/
+share/locale/sq/LC_MESSAGES/amule.mo
+share/locale/sv/LC_MESSAGES/amule.mo
+share/locale/tr/LC_MESSAGES/amule.mo
+share/locale/uk/LC_MESSAGES/amule.mo
share/locale/zh_CN/LC_MESSAGES/amule.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/amule.mo
share/pixmaps/
+share/pixmaps/alc.xpm
share/pixmaps/amule.xpm
+share/pixmaps/amulegui.xpm
+share/pixmaps/wxcas.xpm
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
Index: pkg/PLIST-web
===================================================================
RCS file: /cvs/ports/net/amule/pkg/PLIST-web,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-web
--- pkg/PLIST-web 8 Jul 2007 18:09:58 -0000 1.1
+++ pkg/PLIST-web 19 Oct 2010 15:04:05 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-web,v 1.1 2007/07/08 18:09:58 espie Exp $
-bin/amuleweb
+...@bin bin/amuleweb
@man man/man1/amuleweb.1
share/amule/
share/amule/webserver/
@@ -119,6 +119,76 @@ share/amule/webserver/default/tree-close
share/amule/webserver/default/tree-leaf.gif
share/amule/webserver/default/tree-open.gif
share/amule/webserver/default/yellow.gif
+share/amule/webserver/litoral/
+share/amule/webserver/litoral/amuleweb-main-dload.php
+share/amule/webserver/litoral/amuleweb-main-kad.php
+share/amule/webserver/litoral/amuleweb-main-log.php
+share/amule/webserver/litoral/amuleweb-main-prefs.php
+share/amule/webserver/litoral/amuleweb-main-search.php
+share/amule/webserver/litoral/amuleweb-main-servers.php
+share/amule/webserver/litoral/amuleweb-main-shared.php
+share/amule/webserver/litoral/amuleweb-main-stats.php
+share/amule/webserver/litoral/black.gif
+share/amule/webserver/litoral/blank1x1.gif
+share/amule/webserver/litoral/blue1.gif
+share/amule/webserver/litoral/blue2.gif
+share/amule/webserver/litoral/blue3.gif
+share/amule/webserver/litoral/blue4.gif
+share/amule/webserver/litoral/blue5.gif
+share/amule/webserver/litoral/blue6.gif
+share/amule/webserver/litoral/cancel.gif
+share/amule/webserver/litoral/close.png
+share/amule/webserver/litoral/col.png
+share/amule/webserver/litoral/connect.gif
+share/amule/webserver/litoral/down.png
+share/amule/webserver/litoral/edkserv_0.png
+share/amule/webserver/litoral/edkserv_1.png
+share/amule/webserver/litoral/favicon.ico
+share/amule/webserver/litoral/filter.png
+share/amule/webserver/litoral/fond.gif
+share/amule/webserver/litoral/fond_haut.png
+share/amule/webserver/litoral/footer.php
+share/amule/webserver/litoral/index.html
+share/amule/webserver/litoral/kitty.gif
+share/amule/webserver/litoral/log.php
+share/amule/webserver/litoral/login.php
+share/amule/webserver/litoral/loginfond.gif
+share/amule/webserver/litoral/loginfond_haut.png
+share/amule/webserver/litoral/loginlogo.jpg
+share/amule/webserver/litoral/loginlogo.png
+share/amule/webserver/litoral/logo.png
+share/amule/webserver/litoral/maquette.dwt
+share/amule/webserver/litoral/ok.png
+share/amule/webserver/litoral/pause.png
+share/amule/webserver/litoral/play.png
+share/amule/webserver/litoral/red.gif
+share/amule/webserver/litoral/refresh.png
+share/amule/webserver/litoral/search_0.png
+share/amule/webserver/litoral/search_1.png
+share/amule/webserver/litoral/shared_0.png
+share/amule/webserver/litoral/shared_1.png
+share/amule/webserver/litoral/sheserv_0.png
+share/amule/webserver/litoral/sheserv_1.png
+share/amule/webserver/litoral/stats.php
+share/amule/webserver/litoral/stats_0.png
+share/amule/webserver/litoral/stats_1.png
+share/amule/webserver/litoral/stats_tree.php
+share/amule/webserver/litoral/style.css
+share/amule/webserver/litoral/tab_bottom.png
+share/amule/webserver/litoral/tab_bottom_left.png
+share/amule/webserver/litoral/tab_bottom_right.png
+share/amule/webserver/litoral/tab_left.png
+share/amule/webserver/litoral/tab_right.png
+share/amule/webserver/litoral/tab_top.png
+share/amule/webserver/litoral/tab_top_left.png
+share/amule/webserver/litoral/tab_top_right.png
+share/amule/webserver/litoral/transf_0.png
+share/amule/webserver/litoral/transf_1.png
+share/amule/webserver/litoral/tree-closed.gif
+share/amule/webserver/litoral/tree-leaf.gif
+share/amule/webserver/litoral/tree-open.gif
+share/amule/webserver/litoral/up.png
+share/amule/webserver/litoral/yellow.gif
share/amule/webserver/php-default/
share/amule/webserver/php-default/amuleweb-main-dload.php
share/amule/webserver/php-default/amuleweb-main-kad.php
