svn commit: r369266 - in head/audio/gqmpeg: . files

[Tijl Coosemans]

Author: tijl
Date: Thu Sep 25 16:14:43 2014
New Revision: 369266
URL: http://svnweb.freebsd.org/changeset/ports/369266
QAT: https://qat.redports.org/buildarchive/r369266/

Log:
  Patch configure instead of aclocal.m4 and set CONFIGURE_ENV instead of
  patching configure.in to avoid USE_AUTOTOOLS

Added:
  head/audio/gqmpeg/files/patch-configure   (contents, props changed)
Deleted:
  head/audio/gqmpeg/files/patch-aclocal.m4
  head/audio/gqmpeg/files/patch-configure.in
  head/audio/gqmpeg/files/patch-po_Makefile.in.in
Modified:
  head/audio/gqmpeg/Makefile

Modified: head/audio/gqmpeg/Makefile
==============================================================================
--- head/audio/gqmpeg/Makefile	Thu Sep 25 15:47:25 2014	(r369265)
+++ head/audio/gqmpeg/Makefile	Thu Sep 25 16:14:43 2014	(r369266)
@@ -23,13 +23,11 @@ MPG321_RUN_DEPENDS_OFF=	mpg123:${PORTSDI
 
 USE_GNOME=	gdkpixbuf
 USES=		gettext libtool
-USE_AUTOTOOLS=	autoconf213
-CONFIGURE_ENV+=	USE_GNOME=""
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_path_GNOME_CONFIG=no
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-
-.include <bsd.port.options.mk>
+LIBS+=		-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -E -e \

Added: head/audio/gqmpeg/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/gqmpeg/files/patch-configure	Thu Sep 25 16:14:43 2014	(r369266)
@@ -0,0 +1,31 @@
+--- configure.orig	2003-02-02 05:27:15.000000000 +0100
++++ configure	2014-09-25 17:43:37.000000000 +0200
+@@ -4027,10 +4027,9 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4416,7 +4415,6 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -4424,7 +4422,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then