Fix MASTER_SITES

Add procedure of converting return character

PR:		21206
Submitted by:	Ports Fury

2 files changed, 30 insertions, 49 deletions

diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 01beb35f0508..32e110f05634 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xlines
 PORTVERSION=	1.1
 CATEGORIES=	games
-#MASTER_SITES=	ftp://ftp.trolltech.com/contrib/
+MASTER_SITES=	ftp://ftp.trolltech.com/contrib/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,6 +17,9 @@ USE_QT=		yes
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
+pre-patch:
+	@find ${WRKSRC} -type f | xargs ${PERL} -pi -e "s|\r\n|\n|g"
+
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp
 
diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa
index ca54baadd9bd..7f4c05076817 100644
--- a/games/xlines/files/patch-aa
+++ b/games/xlines/files/patch-aa
@@ -1,53 +1,31 @@
---- Makefile.orig	Sat Jan 17 05:11:10 1998
-+++ Makefile	Tue Aug  1 21:47:09 2000
-@@ -1,25 +1,25 @@
--INCDIR=/usr/local/qt/include

--CFLAGS=-O2 -I/usr/X11/include 

--LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11

--CC=gcc

--MOC=/usr/local/qt/bin/moc

--

--SRC=lines.cpp lines.moc

--OBJECTS=lines.o

--MOCFILES=lines.moc

--

--

--TARGET=xlines

--

--.SUFFIXES:	.cpp

--

--.cpp.o:

--	$(CC) -c $(CFLAGS) -I$(INCDIR) $<

--

--all: $(TARGET)

--

--$(TARGET): $(MOCFILES) $(OBJECTS) lines.h

--	$(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR)

--

--lines.moc: lines.h

--	$(MOC) lines.h -o lines.moc

+--- Makefile.orig	Mon Apr 27 16:47:35 1998
++++ Makefile	Sun Jul 16 19:47:51 2000
+@@ -1,8 +1,8 @@
+-INCDIR=/usr/local/qt/include
+-CFLAGS=-O2 -I/usr/X11/include -DSHOW_NEXT_COLORS
+-LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11
+-CC=gcc
+-MOC=/usr/local/qt/bin/moc
 +INCDIR=${X11BASE}/include/X11/qt
-+CXXFLAGS+=-I${X11BASE}/include
++CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS
 +LFLAGS=-L${X11BASE}/lib -lqt -lX11
-+CXX?=g++
++CC?=gcc
 +MOC=${X11BASE}/bin/moc
-+
-+SRC=lines.cpp lines.moc
-+OBJECTS=lines.o
-+MOCFILES=lines.moc
-+
-+
-+TARGET=xlines
-+
-+.SUFFIXES:	.cpp
-+
-+.cpp.o:
+ 
+ SRC=lines.cpp lines.moc
+ OBJECTS=lines.o 
+@@ -14,12 +14,12 @@
+ .SUFFIXES:	.cpp
+ 
+ .cpp.o:
+-	$(CC) -c $(CFLAGS) -I$(INCDIR) $<
 +	$(CXX) -c $(CXXFLAGS) -I$(INCDIR) $<
-+
-+all: $(TARGET)
-+
-+$(TARGET): $(MOCFILES) $(OBJECTS) lines.h
+ 
+ all: $(TARGET)
+ 
+ $(TARGET): $(MOCFILES) $(OBJECTS) lines.h
+-	$(CC) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR)
 +	$(CXX) $(OBJECTS) -o $(TARGET) $(LFLAGS) -I$(INCDIR)
-+
-+lines.moc: lines.h
-+	$(MOC) lines.h -o lines.moc
+ 
+ lines.moc: lines.h
+ 	$(MOC) lines.h -o lines.moc