o USE_AUTO* police

- Don't hardcode, use ACLOCAL
- USE_AUTOMAKE_VER=15
- Add gdk-pixbuf fixes

3 files changed, 30 insertions, 14 deletions

diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 5ec20f0dd6a3..5aaedb86dc33 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -16,12 +16,16 @@ LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	15
 AUTOMAKE_ARGS=	-a -i
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-configure:
-	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
+	@cd ${WRKSRC}; ${ACLOCAL} -I ${X11BASE}/share/aclocal
+
+pre-build:
+	@${PERL} -pi -e "s/autoheader/${AUTOHEADER}/" \
+		${BUILD_WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/gdcd/files/patch-ae b/audio/gdcd/files/patch-ae
index 19c6d80d99f5..549214031409 100644
--- a/audio/gdcd/files/patch-ae
+++ b/audio/gdcd/files/patch-ae
@@ -1,11 +1,13 @@
---- configure.in.orig	Sat Jan  8 14:40:07 2000
-+++ configure.in	Wed Jun 28 05:28:19 2000
-@@ -16,20 +16,12 @@
+--- configure.in.orig	Sat Jan  8 03:39:45 2000
++++ configure.in	Thu Nov 29 20:04:10 2001
+@@ -15,21 +15,14 @@
+ AC_PROG_INSTALL
  AC_PROG_MAKE_SET
  AC_CANONICAL_HOST
- 
--AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread", AC_MSG_ERROR(Couldn't locate a POSIX threads library))
 -
+-AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread", AC_MSG_ERROR(Couldn't locate a POSIX threads library))
++AM_PATH_GDK_PIXBUF
+ 
  CDAUDIO_LIBS="-lcdaudio"
  
  AM_PATH_GLIB(1.2.0,,,)
@@ -24,16 +26,16 @@
  
  AC_PATH_PROG(LIBART_CONFIG,libart-config,no)
  if test x$LIBART_CONFIG != xno; then
-@@ -60,14 +52,14 @@
+@@ -59,15 +52,9 @@
+ AC_SUBST(GNOME_LIBS)
  AC_SUBST(GNOME_CFLAGS)
  
- AC_CHECK_LIB(gdk_pixbuf, gdk_pixbuf_new_from_file, GDKPIXBUF_LIBS="-lgdk_pixbuf";IMLIB_LIBS="", GDKPIXBUF_LIBS="",$GTK_LIBS $GNOME_LIBS $LIBART_LIBS)
+-AC_CHECK_LIB(gdk_pixbuf, gdk_pixbuf_new_from_file, GDKPIXBUF_LIBS="-lgdk_pixbuf";IMLIB_LIBS="", GDKPIXBUF_LIBS="",$GTK_LIBS $GNOME_LIBS $LIBART_LIBS)
 -if test "$GDKPIXBUF_LIBS" == ""; then
-+if test "$GDKPIXBUF_LIBS" = ""; then
- 	AC_CHECK_LIB(gdk_imlib, gdk_imlib_load_image, IMLIB_LIBS="-lgdk_imlib"; AC_DEFINE(IMLIB_IMAGING), AC_MSG_ERROR(Couldn't locate GdkPixbuf or Imlib), $GTK_LIBS)
- fi
- 
- AC_SUBST(GDKPIXBUF_LIBS)
+-	AC_CHECK_LIB(gdk_imlib, gdk_imlib_load_image, IMLIB_LIBS="-lgdk_imlib"; AC_DEFINE(IMLIB_IMAGING), AC_MSG_ERROR(Couldn't locate GdkPixbuf or Imlib), $GTK_LIBS)
+-fi
+-
+-AC_SUBST(GDKPIXBUF_LIBS)
  AC_SUBST(IMLIB_LIBS)
  
 -IMAGE_PATH='${prefix}/share/gdcd'
diff --git a/audio/gdcd/files/patch-source:Makefile.am b/audio/gdcd/files/patch-source:Makefile.am
new file mode 100644
index 000000000000..b8bd4df22313
--- /dev/null
+++ b/audio/gdcd/files/patch-source:Makefile.am
@@ -0,0 +1,10 @@
+--- source/Makefile.am.orig	Thu Nov 29 20:08:37 2001
++++ source/Makefile.am	Thu Nov 29 20:09:10 2001
+@@ -20,5 +20,5 @@
+ 	       dialog.c \
+ 	       conf.c
+ 
+-CFLAGS = @CFLAGS@ $(GTK_CFLAGS) $(GNOME_CFLAGS) $(LIBART_CFLAGS) -DIMAGE_PATH=\"@IMAGE_PATH@\"
+-LDFLAGS = @LDFLAGS@ $(GTK_LIBS) $(GNOME_LIBS) $(LIBART_LIBS) $(GDKPIXBUF_LIBS) $(IMLIB_LIBS) $(PTHREAD_LIBS) $(CDAUDIO_LIBS)
++CFLAGS = @CFLAGS@ $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(GNOME_CFLAGS) $(LIBART_CFLAGS) -DIMAGE_PATH=\"@IMAGE_PATH@\"
++LDFLAGS = @LDFLAGS@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(GNOME_LIBS) $(LIBART_LIBS) $(IMLIB_LIBS) $(PTHREAD_LIBS) $(CDAUDIO_LIBS)