7 files changed, 9 insertions, 10 deletions
diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index fbec5f6..9216098 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=      adasdl
 PORTVERSION=   20010504
 PORTREVISION=	5
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=    ${PORTNAME}
+MASTER_SITES=  SF
 DISTNAME=      AdaSDL_${PORTVERSION}
 
 MAINTAINER=	david@realityrift.com
@@ -29,9 +28,9 @@ do-patch:
 	for i in `${FIND} ${WRKSRC} -name 'make.conf_x11'`; do \
 		${REINPLACE_CMD} \
 			-e 's,/usr/local,${LOCALBASE},g' \
-			-e 's,/usr/X11R6,${X11BASE},g' \
+			-e 's,/usr/X11R6,${LOCALBASE},g' \
 			-e 's,-lpthread,-pthread,' \
-			-e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \
+			-e 's,-lGL,-L${LOCALBASE}/lib\ -lX11 -lXext -lGL,' \
 		$${i}; \
 	done
 
diff --git a/devel/adasdl/files/patch-AdaGL-make.conf_x11 b/devel/adasdl/files/patch-AdaGL-make.conf_x11
index 17f914a..08bb026 100644
--- a/devel/adasdl/files/patch-AdaGL-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaGL-make.conf_x11
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib -lXext -lX11 -lGL -lGLU
  GNATHTML=/usr/local/bin/gnathtml.pl
  PERL=/usr/bin/perl
  
diff --git a/devel/adasdl/files/patch-AdaSDL-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL-make.conf_x11
index 740144d50..b979af7 100644
--- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib  -lSDL -pthread -lGL -lGLU
  GNATHTML=/usr/local/bin/gnathtml.pl
  PERL=/usr/bin/perl
  EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
index f8fb309..e093659 100644
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
@@ -3,6 +3,6 @@
 @@ -1,4 +1,4 @@
  #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
  
  EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
index b0b4612..8168bf3 100644
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
@@ -4,7 +4,7 @@
  
 -INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I..
 -include ../make.conf
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
 +
 +INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I..
  
diff --git a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
index ba7104b..cc48156 100644
--- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
@@ -3,6 +3,6 @@
 @@ -1,4 +1,4 @@
  #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_image -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_image -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib  -lSDL_image -lSDL -pthread -lGL -lGLU
  
  EXE=
diff --git a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11 b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
index c344fbf..71868d9 100644
--- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
@@ -3,6 +3,6 @@
 @@ -1,4 +1,4 @@
  #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
++LIBS= -L/usr/lib -L${LOCALBASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
  
  EXE=