diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-09-27 02:00:30 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-09-27 02:00:30 +0000 |
| commit | 431a1c18e5d1ba7a9140d94e53e1dd916455e7df (patch) | |
| tree | ece8e46ee1b2069922945aeca3e1d4a55beaae55 /x11/libsx/files/patch-aa | |
| parent | Build properly on ELF systems. (diff) | |
Fix for ELF build and remove empty directories on deinstall.
Notes
Notes:
svn path=/head/; revision=13435
Diffstat (limited to 'x11/libsx/files/patch-aa')
| -rw-r--r-- | x11/libsx/files/patch-aa | 105 |
1 files changed, 41 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 |