svn commit: r477554 - in head/devel/sourcenav: . files
Tobias Kortkamp
tobik at FreeBSD.org
Sun Aug 19 05:05:41 UTC 2018
Author: tobik
Date: Sun Aug 19 05:05:39 2018
New Revision: 477554
URL: https://svnweb.freebsd.org/changeset/ports/477554
Log:
devel/sourcenav: Remove gcc dependency
Sync patches from databases/db48 to unbreak build with Clang
While here
- Fix bad absolute symlink
- Fix WWW
Added:
head/devel/sourcenav/files/patch-db4_dbinc_atomic.h (contents, props changed)
head/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h (contents, props changed)
head/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c (contents, props changed)
Modified:
head/devel/sourcenav/Makefile
head/devel/sourcenav/pkg-descr
Modified: head/devel/sourcenav/Makefile
==============================================================================
--- head/devel/sourcenav/Makefile Sun Aug 19 01:08:54 2018 (r477553)
+++ head/devel/sourcenav/Makefile Sun Aug 19 05:05:39 2018 (r477554)
@@ -3,7 +3,7 @@
PORTNAME= sourcenav
PORTVERSION= 4.5
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/NG${PORTVERSION}
@@ -19,7 +19,6 @@ BROKEN_aarch64= fails to build: undefined reference t
USES= shebangfix tar:bzip2
SHEBANG_FILES= ${WRKSRC}/snavigator/demo/c++/contrib/perl/sample_client
-USE_GCC= yes
USE_XORG= x11
HAS_CONFIGURE= yes
@@ -34,6 +33,7 @@ post-patch:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sourcenav/bin/wish8.3
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sourcenav/bin/tclsh8.3
- ${LN} -s ${PREFIX}/sourcenav/bin/snavigator ${STAGEDIR}${PREFIX}/bin/snavigator
+ ${RLN} ${STAGEDIR}${PREFIX}/sourcenav/bin/snavigator \
+ ${STAGEDIR}${PREFIX}/bin/snavigator
.include <bsd.port.mk>
Added: head/devel/sourcenav/files/patch-db4_dbinc_atomic.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/sourcenav/files/patch-db4_dbinc_atomic.h Sun Aug 19 05:05:39 2018 (r477554)
@@ -0,0 +1,20 @@
+--- db4/dbinc/atomic.h.orig 2010-10-28 20:58:58 UTC
++++ db4/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define atomic_inc(env, p) __atomic_inc(p)
+ #define atomic_dec(env, p) __atomic_dec(p)
+ #define atomic_compare_exchange(env, p, o, n) \
+- __atomic_compare_exchange((p), (o), (n))
++ __atomic_compare_exchange_db((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ int temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+ * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+ * which configure could be changed to use.
+ */
+-static inline int __atomic_compare_exchange(
++static inline int __atomic_compare_exchange_db(
+ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ atomic_value_t was;
Added: head/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h Sun Aug 19 05:05:39 2018 (r477554)
@@ -0,0 +1,11 @@
+--- db4/dbinc/mutex_int.h.orig 2010-10-28 20:58:58 UTC
++++ db4/dbinc/mutex_int.h
+@@ -596,7 +596,7 @@ MUTEX_SET(int *tsl) {
+ : "=&r" (__r), "+r" (tsl)
+ :
+ : "cr0", "memory");
+- return (int)tsl;
++ return (tsl != 0);
+ }
+
+ static inline int
Added: head/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c Sun Aug 19 05:05:39 2018 (r477554)
@@ -0,0 +1,11 @@
+--- snavigator/parsers/php/phpbrowser.c.orig 2010-02-02 12:29:53 UTC
++++ snavigator/parsers/php/phpbrowser.c
+@@ -5878,7 +5878,7 @@ YY_RULE_SETUP
+ free_head_token(); /* const keyword */
+
+ if ( !current_class )
+- return;
++ return 0;
+
+ result = sn_insert_symbol(SN_ENUM_CONST_DEF,
+ current_class,
Modified: head/devel/sourcenav/pkg-descr
==============================================================================
--- head/devel/sourcenav/pkg-descr Sun Aug 19 01:08:54 2018 (r477553)
+++ head/devel/sourcenav/pkg-descr Sun Aug 19 05:05:39 2018 (r477554)
@@ -10,4 +10,4 @@ source code for enhancement or maintenance tasks.
It is based upon the old source navigator and strives to
improve usability and performance.
-WWW: http://sourcenav.berlios.de/
+WWW: http://sourcenav.sourceforge.net/
More information about the svn-ports-all
mailing list