diff options
| author | perky <perky@FreeBSD.org> | 2003-04-09 20:09:37 +0800 |
|---|---|---|
| committer | perky <perky@FreeBSD.org> | 2003-04-09 20:09:37 +0800 |
| commit | 26f71bd08ea0d7b096cbe4ec84ec7d45dbbbdcbd (patch) | |
| tree | d7a6fae9d0f208c2e93ecffebdb77edc0e0c1ee7 | |
| parent | 0c68b9136d5b2c444eb26ceb15c7e5cf2f083a87 (diff) | |
| download | freebsd-ports-gnome-26f71bd08ea0d7b096cbe4ec84ec7d45dbbbdcbd.tar.gz freebsd-ports-gnome-26f71bd08ea0d7b096cbe4ec84ec7d45dbbbdcbd.tar.zst freebsd-ports-gnome-26f71bd08ea0d7b096cbe4ec84ec7d45dbbbdcbd.zip | |
Fix build on -current.
(We don't need to run autotools anymore here. The original tarball
is shipped with `configure' now. :)
| -rw-r--r-- | misc/xosd/Makefile | 13 | ||||
| -rw-r--r-- | misc/xosd/files/patch-src-libxosd-Makefile.am | 8 | ||||
| -rw-r--r-- | misc/xosd/files/patch-src-xmms_plugin-Makefile.am | 10 |
3 files changed, 7 insertions, 24 deletions
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index 3cf1f34abeab..7f2c678cc694 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -24,11 +24,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gtk12 -USE_LIBTOOL= yes -USE_AUTOMAKE_VER= 15 -AUTOMAKE_ARGS= --add-missing -USE_AUTOCONF= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +USE_REINPLACE= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib -lgnugetopt' \ CFLAGS='${CFLAGS}' X11BASE='${X11BASE}' \ GTK_CONFIG='${GTK_CONFIG}' GLIB_CONFIG='${GLIB_CONFIG}' \ @@ -40,7 +38,10 @@ MAN3= xosd_destroy.3 xosd_is_onscreen.3 xosd_set_shadow_offset.3 \ xosd.3 xosd_get_number_lines.3 xosd_set_horizontal_offset.3 \ xosd_show.3 xosd_create.3 xosd_hide.3 xosd_set_pos.3 xosd_uninit.3 -pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --force && ${ACLOCAL} +pre-patch: + ${REINPLACE_CMD} -e 's,-lc_r,-lblahblah,g' ${WRKSRC}/ltmain.sh +.for f in src/libxosd/Makefile.in src/xmms_plugin/Makefile.in + ${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I.. \2,g' ${WRKSRC}/$f +.endfor .include <bsd.port.mk> diff --git a/misc/xosd/files/patch-src-libxosd-Makefile.am b/misc/xosd/files/patch-src-libxosd-Makefile.am deleted file mode 100644 index be1d3536e87d..000000000000 --- a/misc/xosd/files/patch-src-libxosd-Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ ---- src/libxosd/Makefile.am~ Thu Aug 15 18:00:38 2002 -+++ src/libxosd/Makefile.am Wed Sep 18 17:16:18 2002 -@@ -1,4 +1,4 @@ --CFLAGS=@CFLAGS@ -I.. -+CFLAGS=-I.. @CFLAGS@ - # Library - lib_LTLIBRARIES = libxosd.la - libxosd_la_SOURCES = xosd.c diff --git a/misc/xosd/files/patch-src-xmms_plugin-Makefile.am b/misc/xosd/files/patch-src-xmms_plugin-Makefile.am deleted file mode 100644 index f5640ade051c..000000000000 --- a/misc/xosd/files/patch-src-xmms_plugin-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- src/xmms_plugin/Makefile.am.orig Sun Mar 2 12:06:14 2003 -+++ src/xmms_plugin/Makefile.am Mon Mar 31 13:58:03 2003 -@@ -1,6 +1,6 @@ - # XMMS library - --AM_CFLAGS=@XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ -I.. -+AM_CFLAGS=-I.. @XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ -I.. - - xmmsplugindir = ${XMMS_PLUGIN_DIR} - |