Page MenuHomeFreeBSD
Files F153154970

D9285.id24396.diff
No OneTemporary
Actions

D9285.id24396.diff
View Options

Index: head/net-mgmt/ccnet-client/Makefile
===================================================================
--- head/net-mgmt/ccnet-client/Makefile
+++ head/net-mgmt/ccnet-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ccnet-client
-PORTVERSION= 6.0.1
+PORTVERSION= 6.0.2
DISTVERSIONPREFIX= v
CATEGORIES= net-mgmt devel
@@ -9,7 +9,7 @@
COMMENT= Framework for writing networked applications
LICENSE= GPLv3
-LICENSE_FILE= ${WRKSRC}/LICENCE.txt
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libsearpc.so:devel/libsearpc \
@@ -26,11 +26,10 @@
GH_PROJECT= ccnet
USES= autoreconf gettext libtool localbase pathfix pkgconfig \
- python:-2.7 shebangfix ssl
+ python:-2.7 ssl
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_OPENLDAP= yes
-SHEBANG_FILES= tools/*.py
CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
GNU_CONFIGURE= yes
Index: head/net-mgmt/ccnet-client/distinfo
===================================================================
--- head/net-mgmt/ccnet-client/distinfo
+++ head/net-mgmt/ccnet-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481772896
-SHA256 (haiwen-ccnet-v6.0.1_GH0.tar.gz) = fc477904240ada0e3f20d840d40e50c4f1693959e6dc78817616f5f49aa4d227
-SIZE (haiwen-ccnet-v6.0.1_GH0.tar.gz) = 222193
+TIMESTAMP = 1484493215
+SHA256 (haiwen-ccnet-v6.0.2_GH0.tar.gz) = c78e4bc7b42fbaa8afae4edc5d474da72ae2d4c06745e3452e4926316d832862
+SIZE (haiwen-ccnet-v6.0.2_GH0.tar.gz) = 176698
Index: head/net-mgmt/ccnet-client/files/patch-Makefile.am
===================================================================
--- head/net-mgmt/ccnet-client/files/patch-Makefile.am
+++ head/net-mgmt/ccnet-client/files/patch-Makefile.am
@@ -1,13 +1,12 @@
---- Makefile.am.orig 2015-11-26 15:34:14 UTC
+--- Makefile.am.orig 2017-01-15 15:09:00 UTC
+++ Makefile.am
-@@ -24,9 +24,13 @@ ACLOCAL_AMFLAGS = -I m4
- install-data-local:
+@@ -15,8 +15,12 @@ install-data-local:
if MACOS
sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
-+else
+ else
+if BSD
+ sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles)
- else
++else
${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
endif
+endif
Index: head/net-mgmt/ccnet-client/files/patch-configure.ac
===================================================================
--- head/net-mgmt/ccnet-client/files/patch-configure.ac
+++ head/net-mgmt/ccnet-client/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2015-11-11 09:50:52 UTC
+--- configure.ac.orig 2017-01-05 06:13:46 UTC
+++ configure.ac
-@@ -51,8 +51,16 @@ else
+@@ -52,8 +52,16 @@ else
AC_MSG_RESULT(no)
fi
@@ -18,7 +18,7 @@
blinux=true
AC_MSG_RESULT(compile in linux)
else
-@@ -154,6 +162,7 @@ AM_CONDITIONAL([COMPILE_DEMO], [test "${
+@@ -63,6 +71,7 @@ fi
AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
@@ -26,7 +26,7 @@
# check libraries
-@@ -213,6 +222,7 @@ if test "$bwin32" = true; then
+@@ -122,6 +131,7 @@ if test "$bwin32" = true; then
LIBS=
LIB_RESOLV=
LIB_UUID=-lrpcrt4
@@ -34,7 +34,7 @@
LIB_IPHLPAPI=-liphlpapi
LIB_SHELL32=-lshell32
LIB_PSAPI=-lpsapi
-@@ -225,11 +235,25 @@ elif test "$bmac" = true ; then
+@@ -134,11 +144,25 @@ elif test "$bmac" = true ; then
LIB_INTL=
LIB_RESOLV=-lresolv
LIB_UUID=
@@ -60,7 +60,7 @@
else
LIB_WS32=
LIB_GDI32=
-@@ -237,6 +261,7 @@ else
+@@ -146,6 +170,7 @@ else
LIB_INTL=
LIB_RESOLV=-lresolv
LIB_UUID=-luuid
@@ -68,7 +68,7 @@
LIB_IPHLPAPI=
LIB_SHELL32=
LIB_PSAPI=
-@@ -250,6 +275,7 @@ AC_SUBST(LIB_RT)
+@@ -159,6 +184,7 @@ AC_SUBST(LIB_RT)
AC_SUBST(LIB_INTL)
AC_SUBST(LIB_RESOLV)
AC_SUBST(LIB_UUID)
Index: head/net-mgmt/ccnet-client/pkg-plist
===================================================================
--- head/net-mgmt/ccnet-client/pkg-plist
+++ head/net-mgmt/ccnet-client/pkg-plist
@@ -1,9 +1,4 @@
bin/ccnet
-bin/ccnet-demo-client
-bin/ccnet-demo-server
-bin/ccnet-init
-bin/ccnet-servtool
-bin/ccnet-tool
include/ccnet.h
include/ccnet/async-rpc-proc.h
include/ccnet/ccnet-client.h

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 12:30 PM (16 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31833350
Default Alt Text
D9285.id24396.diff (4 KB)

Event Timeline