diff options
| author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-21 21:49:38 +0800 |
|---|---|---|
| committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-21 21:49:38 +0800 |
| commit | 0589d183f8aadf4a873cbb1fc097e52b115d4685 (patch) | |
| tree | 5eb5ff34a33b922e96bb51c82552ad2b8ec04931 | |
| parent | 1e019c3b87e93c8a3637624adcbd192ba2a8f80c (diff) | |
| download | marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar.gz marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar.bz2 marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar.lz marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar.xz marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.tar.zst marcuscom-ports-0589d183f8aadf4a873cbb1fc097e52b115d4685.zip | |
Use a more elegant way to use libarchive from base. Instead of removing
the check in configure.ac, hint it with the right flags. That way we
can avoid patching configure.ac [1]
[1] Submitted by: kwm
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@20007 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/appstream-glib/Makefile | 9 | ||||
| -rw-r--r-- | devel/appstream-glib/files/patch-configure.ac | 10 |
2 files changed, 5 insertions, 14 deletions
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index dc4cbb344..52a67ddbd 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -20,16 +20,17 @@ GH_PROJECT= appstream-glib GH_COMMIT= f4f3230 GH_TAGNAME= ${GH_COMMIT} -GNU_CONFIGURE= yes -USE_GITHUB= yes USES= autoreconf:build gmake libtool pathfix pkgconfig USE_GNOME= gdkpixbuf2 glib20 gnomehier gtk30 intlhack USE_LDCONFIG= yes +GNU_CONFIGURE= yes +USE_GITHUB= yes PATHFIX_MAKEFILEIN= Makefile.am -LDFLAGS+= -larchive +CONFIGURE_ENV= LIBARCHIVE_CFLAGS=" " \ + LIBARCHIVE_LIBS="-larchive" INSTALL_TARGET= install-strip pre-configure: - cd ${WRKSRC} && intltoolize -f -c && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh + cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh .include <bsd.port.mk> diff --git a/devel/appstream-glib/files/patch-configure.ac b/devel/appstream-glib/files/patch-configure.ac deleted file mode 100644 index 4fbbc9a9b..000000000 --- a/devel/appstream-glib/files/patch-configure.ac +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-10-21 08:42:44.875520834 +0200 -+++ configure.ac 2014-10-21 08:42:55.278520321 +0200 -@@ -123,7 +123,6 @@ - AM_CONDITIONAL(HAVE_GPERF, [test x$GPERF != xno]) - - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.1 gio-2.0 gobject-2.0 gthread-2.0 gio-unix-2.0 gmodule-2.0) --PKG_CHECK_MODULES(LIBARCHIVE, libarchive) - PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.24) - PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= 2.14 gtk+-3.0) - PKG_CHECK_MODULES(SQLITE, sqlite3) |