- Add RESTRICTED line

- Support CC/CFLAGS/PREFIX properly
- Change location of data files from lib/ to share/

PR: 22740
Submitted by: Ports Fury

3 files changed, 71 insertions, 49 deletions

diff --git a/audio/mp3encode/Makefile b/audio/mp3encode/Makefile
index 2a2d45414df0..19b60d1f4dcd 100644
--- a/audio/mp3encode/Makefile
+++ b/audio/mp3encode/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: mp3encode
+# New ports collection makefile for:	mp3encode
 # Date created:		5th August, 1998
 # Whom:			Joel Sutton <jsutton@bbcon.com.au>
 #
@@ -7,20 +7,25 @@
 
 PORTNAME=	mp3encode
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.sunet.se/pub/multimedia/Berkeley/mpeg2/conformance-bitstreams/audio/mpeg2/software/technical_report/
 DISTNAME=	dist10
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
+
+RESTRICTED=	Condition is not clear
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lsf/encoder
-ALL_TARGET=	encode
-HAS_CONFIGURE=	yes
+
 USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+ALL_TARGET=	encode
 
 # Directories and extra files
 #
-TABLE_LIB=	${PREFIX}/lib/mp3encode
+TABLE_LIB=	${PREFIX}/share/mp3encode
 TABLE_LIB_SED=	${TABLE_LIB:S/\//\\\//g}
 TABLE_FILES=	1cb0 1cb1 1cb2 1cb4 1cb5 1cb6 1th0 1th1 1th2 1th4 1th5 1th6 \
 		2cb0 2cb1 2cb2 2cb4 2cb5 2cb6 2th0 2th1 2th2 2th4 2th5 2th6 \
@@ -37,8 +42,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/encode ${PREFIX}/bin
 	@${ECHO} "===>  Installing table files"
 	-${MKDIR} ${TABLE_LIB}
-	for file in ${TABLE_FILES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/tables/$$file ${TABLE_LIB}/ ;\
-	done
+.for file in ${TABLE_FILES}
+	${INSTALL_DATA} ${WRKSRC}/tables/${file} ${TABLE_LIB}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/mp3encode/files/patch-aa b/audio/mp3encode/files/patch-aa
index c84422453a5d..2445df2d14cb 100644
--- a/audio/mp3encode/files/patch-aa
+++ b/audio/mp3encode/files/patch-aa
@@ -1,5 +1,22 @@
-*** Makefile.in.orig	Wed May 20 22:00:23 1998
---- Makefile.in	Wed May 20 22:07:53 1998
+*** Makefile.in.orig	Wed Jan 22 18:43:12 1997
+--- Makefile.in	Wed Nov  8 05:12:34 2000
+***************
+*** 16,22 ****
+  ## Received from Mike Coleman
+  ############################################################################
+  
+! CC = gcc
+  
+  c_sources = \
+  	common.c \
+--- 16,22 ----
+  ## Received from Mike Coleman
+  ############################################################################
+  
+! CC = @CC@
+  
+  c_sources = \
+  	common.c \
 ***************
 *** 40,46 ****
   
@@ -13,7 +30,7 @@
   
   NINT_SWITCH = @NINTSW@
   
-! CC_SWITCHES = -g -O3 -DUNIX -DBS_FORMAT=BINARY $(NINT_SWITCH) -DNDEBUG
+! CC_SWITCHES = @CFLAGS@ -DUNIX -DBS_FORMAT=BINARY $(NINT_SWITCH) -DNDEBUG
   
   PGM = encode
   
diff --git a/audio/mp3encode/pkg-plist b/audio/mp3encode/pkg-plist
index 6651cccf3043..89bd1725b843 100644
--- a/audio/mp3encode/pkg-plist
+++ b/audio/mp3encode/pkg-plist
@@ -1,39 +1,39 @@
 bin/encode
-lib/mp3encode/1cb0
-lib/mp3encode/1cb1
-lib/mp3encode/1cb2
-lib/mp3encode/1cb4
-lib/mp3encode/1cb5
-lib/mp3encode/1cb6
-lib/mp3encode/1th0
-lib/mp3encode/1th1
-lib/mp3encode/1th2
-lib/mp3encode/1th4
-lib/mp3encode/1th5
-lib/mp3encode/1th6
-lib/mp3encode/2cb0
-lib/mp3encode/2cb1
-lib/mp3encode/2cb2
-lib/mp3encode/2cb4
-lib/mp3encode/2cb5
-lib/mp3encode/2cb6
-lib/mp3encode/2th0
-lib/mp3encode/2th1
-lib/mp3encode/2th2
-lib/mp3encode/2th4
-lib/mp3encode/2th5
-lib/mp3encode/2th6
-lib/mp3encode/absthr_0
-lib/mp3encode/absthr_1
-lib/mp3encode/absthr_2
-lib/mp3encode/alloc_0
-lib/mp3encode/alloc_1
-lib/mp3encode/alloc_2
-lib/mp3encode/alloc_3
-lib/mp3encode/alloc_4
-lib/mp3encode/dewindow
-lib/mp3encode/enwindow
-lib/mp3encode/huffcode
-lib/mp3encode/huffdec
-lib/mp3encode/psy_data
-@dirrm lib/mp3encode
+share/mp3encode/1cb0
+share/mp3encode/1cb1
+share/mp3encode/1cb2
+share/mp3encode/1cb4
+share/mp3encode/1cb5
+share/mp3encode/1cb6
+share/mp3encode/1th0
+share/mp3encode/1th1
+share/mp3encode/1th2
+share/mp3encode/1th4
+share/mp3encode/1th5
+share/mp3encode/1th6
+share/mp3encode/2cb0
+share/mp3encode/2cb1
+share/mp3encode/2cb2
+share/mp3encode/2cb4
+share/mp3encode/2cb5
+share/mp3encode/2cb6
+share/mp3encode/2th0
+share/mp3encode/2th1
+share/mp3encode/2th2
+share/mp3encode/2th4
+share/mp3encode/2th5
+share/mp3encode/2th6
+share/mp3encode/absthr_0
+share/mp3encode/absthr_1
+share/mp3encode/absthr_2
+share/mp3encode/alloc_0
+share/mp3encode/alloc_1
+share/mp3encode/alloc_2
+share/mp3encode/alloc_3
+share/mp3encode/alloc_4
+share/mp3encode/dewindow
+share/mp3encode/enwindow
+share/mp3encode/huffcode
+share/mp3encode/huffdec
+share/mp3encode/psy_data
+@dirrm share/mp3encode