5 files changed, 7 insertions, 14 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 54ca1d689273..aeceab702c5d 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -56,10 +56,6 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if !exists(/usr/lib/libexecinfo.so)
-STATIC_LIBEXECINFO=	${LOCALBASE}/lib/libexecinfo.a
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/monitor_bsd.xpm \
 		${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm
@@ -85,9 +81,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/${f}
 .endfor
-	@${REINPLACE_CMD} \
-		-e 's,%%STATIC_LIBEXECINFO%%,${STATIC_LIBEXECINFO},g' \
-		${WRKSRC}/configure
 
 .if exists(${PREFIX}/share/gnome/wm-properties)
 pre-install:
diff --git a/x11-wm/afterstep-stable/files/patch-configure b/x11-wm/afterstep-stable/files/patch-configure
index cbbc10624a2a..d53965cab59f 100644
--- a/x11-wm/afterstep-stable/files/patch-configure
+++ b/x11-wm/afterstep-stable/files/patch-configure
@@ -5,7 +5,7 @@
  
  if test "x$enable_staticlibs" = "xyes"; then
 -   AFTERBASE_LIB="../../libAfterBase/libAfterBase.a"
-+   AFTERBASE_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%"
++   AFTERBASE_LIB="../../libAfterBase/libAfterBase.a
     AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.a"
     AFTERSTEP_LIB="../../libAfterStep/libAfterStep.a"
     AFTERCONF_LIB="../../libAfterConf/libAfterConf.a"
@@ -14,7 +14,7 @@
     		LIBINSTALL="install.cyg"
  	else
 -   		AFTERBASE_LIB="../../libAfterBase/libAfterBase.so"
-+   		AFTERBASE_LIB="../../libAfterBase/libAfterBase.so %%STATIC_LIBEXECINFO%%"
++   		AFTERBASE_LIB="../../libAfterBase/libAfterBase.so
     		AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.so"
     		AFTERSTEP_LIB="../../libAfterStep/libAfterStep.so"
     		AFTERCONF_LIB="../../libAfterConf/libAfterConf.so"
@@ -23,7 +23,7 @@
  fi
  
 -AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a"
-+AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%"
++AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a
  AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a"
  AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a"
  AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a"
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-configure b/x11-wm/afterstep-stable/files/patch-libAfterBase-configure
index fa125f4bc0f2..f66c555be866 100644
--- a/x11-wm/afterstep-stable/files/patch-libAfterBase-configure
+++ b/x11-wm/afterstep-stable/files/patch-libAfterBase-configure
@@ -4,7 +4,7 @@
  
  
  
-+execinfo_libs="-L%%LOCALBASE%%/lib -lexecinfo"
++execinfo_libs="-lexecinfo"
 +LIBS="$execinfo_libs $LIBS"
  for ac_func in backtrace_symbols_fd backtrace_symbols backtrace
  do
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in b/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in
index 787ecc9307db..2bcd822903bc 100644
--- a/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in
+++ b/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in
@@ -5,7 +5,7 @@
  
  LIBS_PRIVATE      = ../libAfterConf/libAfterConf.a ../libAfterStep/libAfterStep.a\
 -		    ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a
-+		    ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -L%%LOCALBASE%%/lib -lexecinfo
++		    ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -lexecinfo
  
  LIB_INCS= afterconf.h
  
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterImage-configure b/x11-wm/afterstep-stable/files/patch-libAfterImage-configure
index 40bff32e6985..b044ede80708 100644
--- a/x11-wm/afterstep-stable/files/patch-libAfterImage-configure
+++ b/x11-wm/afterstep-stable/files/patch-libAfterImage-configure
@@ -5,10 +5,10 @@
  	AFTERBASE_C=
      if test "x$have_x" != "xyes" -a "x$have_gif" = "xyes"; then
 -    	AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase"
-+    	AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase -L%%LOCALBASE%%/lib -lexecinfo"
++    	AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase -lexecinfo"
      else
 -    	AFTERIMAGE_LIBS="-lAfterBase $AFTERIMAGE_LIBS"
-+    	AFTERIMAGE_LIBS="-lAfterBase -L%%LOCALBASE%%/lib -lexecinfo $AFTERIMAGE_LIBS"
++    	AFTERIMAGE_LIBS="-lAfterBase -lexecinfo $AFTERIMAGE_LIBS"
      fi
      if test -r "../libAfterBase/astypes.h"; then
      	AFTERIMAGE_APPS_LIBS="-L../ -L../../libAfterBase -lAfterImage $AFTERIMAGE_LIBS"