diff options
| author | tijl <tijl@FreeBSD.org> | 2018-06-14 20:47:58 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2018-06-14 20:47:58 +0800 |
| commit | 118df57fa4a8439a5b0ddd13a6c2d843bdb5f853 (patch) | |
| tree | 887d2ee07449ef7ef155da1e40fc852d2d19c539 /deskutils | |
| parent | 37fc2f23670f59cd2f0e4c67e6d99449e0a5a9f2 (diff) | |
| download | freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.tar.gz freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.tar.zst freebsd-ports-gnome-118df57fa4a8439a5b0ddd13a6c2d843bdb5f853.zip | |
Update automake to 1.16.1. Also remove automake-wrapper. We haven't had
multiple versions of automake in years and probably won't in the future.
PR: 228809
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/multisync/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/multisync/files/patch-src-libversit-Makefile.am | 11 | ||||
| -rw-r--r-- | deskutils/pinot/files/patch-Core_Makefile.am | 36 |
3 files changed, 47 insertions, 1 deletions
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index fc90ef44f0b7..53741c0d3233 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -16,7 +16,6 @@ USE_GNOME= gnomeprefix libgnomeui GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip post-patch: diff --git a/deskutils/multisync/files/patch-src-libversit-Makefile.am b/deskutils/multisync/files/patch-src-libversit-Makefile.am new file mode 100644 index 000000000000..0fc39644df14 --- /dev/null +++ b/deskutils/multisync/files/patch-src-libversit-Makefile.am @@ -0,0 +1,11 @@ +--- src/libversit/Makefile.am.orig 2004-04-12 04:23:21 UTC ++++ src/libversit/Makefile.am +@@ -20,7 +20,7 @@ libversit_la_SOURCES = $(VERSIT_SRC) + AM_CFLAGS = -D_VCTEST_CONSOLE + noinst_PROGRAMS = vctest + vctest_SOURCES = vctest.c +-vctest_LDADD = -L. -lversit ++vctest_LDADD = libversit.la + + EXTRA_DIST = README.TXT vcaltest.c vctest.c + diff --git a/deskutils/pinot/files/patch-Core_Makefile.am b/deskutils/pinot/files/patch-Core_Makefile.am new file mode 100644 index 000000000000..889e3a2fe408 --- /dev/null +++ b/deskutils/pinot/files/patch-Core_Makefile.am @@ -0,0 +1,36 @@ +--- Core/Makefile.am.orig 2016-06-20 18:07:02 UTC ++++ Core/Makefile.am +@@ -64,7 +64,7 @@ pinot_index_LDADD = \ + + pinot_index_SOURCES = pinot-index.cpp + +-pinot_index_DEPENDENCIES = libCore.la ++pinot_index_DEPENDENCIES = libCore.la libThread.la + + pinot_search_LDFLAGS = \ + -export-dynamic +@@ -82,7 +82,7 @@ pinot_search_LDADD = \ + pinot_search_SOURCES = \ + pinot-search.cpp + +-pinot_search_DEPENDENCIES = libCore.la ++pinot_search_DEPENDENCIES = libCore.la libThread.la + + pinot_dbus_daemon_LDFLAGS = \ + -export-dynamic +@@ -105,7 +105,7 @@ pinot_dbus_daemon_SOURCES = \ + ServerThreads.cpp \ + pinot-dbus-daemon.cpp + +-pinot_dbus_daemon_DEPENDENCIES = libCore.la ++pinot_dbus_daemon_DEPENDENCIES = libCore.la libThread.la + + pinot_daemon_LDFLAGS = \ + -export-dynamic +@@ -128,5 +128,5 @@ pinot_daemon_SOURCES = \ + ServerThreads.cpp \ + pinot-dbus-daemon.cpp + +-pinot_daemon_DEPENDENCIES = libCore.la ++pinot_daemon_DEPENDENCIES = libCore.la libThread.la + |