Some fix about MASTER_SITES, LIB_DEPENDS, I18N support, CC/CFLAGS.

Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

4 files changed, 67 insertions, 10 deletions

diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 411a0e479e6a..668355ec3d78 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -9,18 +9,39 @@
 DISTNAME=	replay-source-dgtk_0.61
 PKGNAME=	replay-0.61
 CATEGORIES=	audio
-MASTER_SITES=	http://replay.linuxpower.org/files/ \
-		ftp://ftp.replicant.nu/pub/replay/ \
+MASTER_SITES=	ftp://ftp.replicant.nu/pub/replay/ \
 		ftp://ftp.icemark.ch/pub/replay/ \
 		ftp://k2.lund.se/pub/replay/
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		esd.2:${PORTSDIR}/audio/esound
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+
+.if defined(USE_I18N)
+CONFIGURE_ARGS+=       --enable-i18n=JAPANESE
+.endif
+
+pre-configure:
+.if !defined(USE_I18N)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you would like build replay with I18N support"
+	@${ECHO_MSG} "you must set the variable USE_I18N"
+	@${ECHO_MSG} "(Now JAPANESE only)"
+	@${ECHO_MSG}
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Building replay with I18N support"
+	@${ECHO_MSG}
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/replay ${PREFIX}/bin
diff --git a/audio/replay/files/patch-aa b/audio/replay/files/patch-aa
index bc490b95c6bd..f2faa725c5e8 100644
--- a/audio/replay/files/patch-aa
+++ b/audio/replay/files/patch-aa
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Wed Oct 28 00:22:43 1998
-+++ Makefile.in	Wed Oct 28 00:23:24 1998
+--- Makefile.in.orig   Sat Jan 23 03:50:57 1999
++++ Makefile.in        Sun Dec  5 10:20:13 1999
 @@ -3,7 +3,7 @@
  #DEBUG = -DDEBUG
  
  # Make sure the path is correct!
 -GTK-CONFIG = "gtk-config"
-+GTK-CONFIG = "gtk12-config"
++GTK-CONFIG = "@GTK_CONFIG@"
  
  # ---- @OS_TYPE@/@ARCH_TYPE@ ----
- 
diff --git a/audio/replay/files/patch-ae b/audio/replay/files/patch-ae
new file mode 100644
index 000000000000..34dc1a5a04cc
--- /dev/null
+++ b/audio/replay/files/patch-ae
@@ -0,0 +1,37 @@
+--- configure.orig     Sat Jan 23 03:50:58 1999
++++ configure  Sun Dec  5 11:25:05 1999
+@@ -1484,7 +1484,7 @@
+ ARCH_TYPE=`uname -m`
+ echo "$ac_t""$ARCH_TYPE" 1>&6
+ 
+-CFLAGS=
++CFLAGS=$CFLAGS
+ CFLAGS_ARCH=
+ DEFINES=
+ 
+@@ -1502,7 +1502,7 @@
+     ;;
+ 
+   Linux|FreeBSD)
+-    CC="gcc"
++    CC="$CC"
+     if test "$ARCH_TYPE" = "i486" ; then
+       CFLAGS_ARCH="-m486"
+     fi
+@@ -1512,7 +1512,7 @@
+     if test "$OS_TYPE" = "FreeBSD" ; then
+       OS_TYPE="BSD"
+     fi
+-    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
++    CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
+     DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
+     ;;
+ 
+@@ -1806,6 +1806,7 @@
+ s%@CFLAGS_ARCH@%$CFLAGS_ARCH%g
+ s%@DEFINES@%$DEFINES%g
+ s%@ESD_LIB@%$ESD_LIB%g
++s%@GTK_CONFIG@%$GTK_CONFIG%g
+ 
+ CEOF
+ EOF
diff --git a/audio/replay/pkg-comment b/audio/replay/pkg-comment
index cf5744e165ea..64d30f40974e 100644
--- a/audio/replay/pkg-comment
+++ b/audio/replay/pkg-comment
@@ -1 +1 @@
-Another GTK-base mp3 player
+Another GTK-based mp3 player