Fix for ELF build and remove empty directories on deinstall.

2 files changed, 43 insertions, 64 deletions

diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa
index f1e087cfad7c..551b99b67aeb 100644
--- a/x11/libsx/files/patch-aa
+++ b/x11/libsx/files/patch-aa
@@ -1,64 +1,41 @@
-*** libsx_defs.orig	Mon Feb 28 11:04:26 1994
---- libsx_defs	Tue Dec 24 01:13:01 1996
-***************
-*** 9,15 ****
-  # you have it).  Using cc seems to also work on the RS/6000 (though
-  # you may need the -xansi or -ansi flag). 
-  #CC     = gcc
-! CC     = cc
-  
-  
-  # Using gcc it's nice to be real strict and compile with -Wall, for
---- 9,15 ----
-  # you have it).  Using cc seems to also work on the RS/6000 (though
-  # you may need the -xansi or -ansi flag). 
-  #CC     = gcc
-! #CC     = cc
-  
-  
-  # Using gcc it's nice to be real strict and compile with -Wall, for
-***************
-*** 46,60 ****
-  # If you're daring, and you have OpenGL, try:
-  #  CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT
-  #
-! CFLAGS = -g -D_POSIX_SOURCE 
-  
-  #
-  # if you are on a System V (like the SGI) machine, just define RANLIB
-  # to be something innocuous like `echo'. On a Sun or other BSD machine
-  # (like a DECstation, AIX) we need to run the ranlib program.
-  #
-! #RANLIB=ranlib
-! RANLIB=echo
-  
-  #
-  # libraries we need to link with...
---- 46,60 ----
-  # If you're daring, and you have OpenGL, try:
-  #  CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT
-  #
-! CFLAGS += -O -D_POSIX_SOURCE -I$(X11BASE)/include
-  
-  #
-  # if you are on a System V (like the SGI) machine, just define RANLIB
-  # to be something innocuous like `echo'. On a Sun or other BSD machine
-  # (like a DECstation, AIX) we need to run the ranlib program.
-  #
-! RANLIB=ranlib
-! #RANLIB=echo
-  
-  #
-  # libraries we need to link with...
-***************
-*** 83,87 ****
-  #
-  LIBSX  = ../src/libsx.a
-  #LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
-! LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
-! 
---- 83,86 ----
-  #
-  LIBSX  = ../src/libsx.a
-  #LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
-! LIBS   =  $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib
+--- libsx_defs.orig	Mon Feb 28 10:04:26 1994
++++ libsx_defs	Sat Sep 26 20:55:27 1998
+@@ -9,7 +9,7 @@
+ # you have it).  Using cc seems to also work on the RS/6000 (though
+ # you may need the -xansi or -ansi flag). 
+ #CC     = gcc
+-CC     = cc
++#CC     = cc
+ 
+ 
+ # Using gcc it's nice to be real strict and compile with -Wall, for
+@@ -46,15 +46,15 @@
+ # If you're daring, and you have OpenGL, try:
+ #  CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT
+ #
+-CFLAGS = -g -D_POSIX_SOURCE 
++CFLAGS += -O -D_POSIX_SOURCE -I$(X11BASE)/include
+ 
+ #
+ # if you are on a System V (like the SGI) machine, just define RANLIB
+ # to be something innocuous like `echo'. On a Sun or other BSD machine
+ # (like a DECstation, AIX) we need to run the ranlib program.
+ #
+-#RANLIB=ranlib
+-RANLIB=echo
++RANLIB=ranlib
++#RANLIB=echo
+ 
+ #
+ # libraries we need to link with...
+@@ -83,5 +83,7 @@
+ #
+ LIBSX  = ../src/libsx.a
+ #LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
+-LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
+-
++LIBS   =  $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib
++.if ${PORTOBJFORMAT} == "elf"
++LIBS+=	-Wl,-rpath,${X11BASE}/lib
++.endif
+\ No newline at end of file
diff --git a/x11/libsx/pkg-plist b/x11/libsx/pkg-plist
index 550a793bb906..89ef45ca928c 100644
--- a/x11/libsx/pkg-plist
+++ b/x11/libsx/pkg-plist
@@ -20,3 +20,5 @@ share/doc/libsx/string_entry.doc.gz
 share/doc/libsx/text_edit.doc.gz
 share/doc/libsx/toggle.doc.gz
 share/doc/libsx/windows.doc.gz
+@dirrm include/X11/libsx
+@dirrm share/doc/libsx