From 217ed45bf94757c34f79783b7402354783903558 Mon Sep 17 00:00:00 2001
From: Alexander Langer <alex@FreeBSD.org>
Date: Sun, 16 Jul 2000 14:31:54 +0000
Subject: - Update MASTER_SITES and WWW: line of pkg/DESCR - Support
 CC/CFLAGS/PREFIX/LOCALBASE/X11BASE/etc properly

PR:		19757
Submitted by:	Ports Fury
---
 games/libshhcards/files/patch-aa | 76 +++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 28 deletions(-)

(limited to 'games/libshhcards/files')

diff --git a/games/libshhcards/files/patch-aa b/games/libshhcards/files/patch-aa
index 898cd23991b5..098d95429562 100644
--- a/games/libshhcards/files/patch-aa
+++ b/games/libshhcards/files/patch-aa
@@ -1,19 +1,6 @@
---- Makefile.orig	Sun Jul  5 11:52:26 1998
-+++ Makefile	Sun May 30 21:07:36 1999
-@@ -1,14 +1,17 @@
- # $Id: Makefile,v 1.4 1998/07/05 16:52:26 sverrehu Exp $
- DIST		= shhcards
- VERMAJ		= 1
--VERMIN		= 0
--VERPAT		= 4
--VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
-+VERMIN		= 1
-+ifeq ($(PORTOBJFORMAT),elf)
-+VERSION		= $(VERMAJ)
-+else
-+VERSION		= $(VERMAJ).$(VERMIN)
-+endif
- 
+--- Makefile.orig	Mon Jul  6 01:52:26 1998
++++ Makefile	Tue Jul  4 21:38:46 2000
+@@ -8,7 +8,7 @@
  ###########################################################################
  
  # Define SHARED as 1 for Linux shared ELF library
@@ -22,18 +9,36 @@
  
  ifeq ($(SHARED),1)
  LIBTARGET	= lib$(DIST).so.$(VERSION)
-@@ -28,8 +31,8 @@
- INSTALL		= install -m 644
- MKDIRP		= install -d -m 755
+@@ -22,13 +22,13 @@
+ LIBHEAD		= $(DIST).h
+ TARGETS		= $(LIBTARGET)
+ 
+-INSTBASEDIR	= /usr/local
++INSTBASEDIR	= ${PREFIX}
+ INSTLIBDIR	= $(INSTBASEDIR)/lib
+ INSTINCDIR	= $(INSTBASEDIR)/include
+-INSTALL		= install -m 644
+-MKDIRP		= install -d -m 755
++INSTALL		= ${BSD_INSTALL_DATA}
++MKDIRP		= mkdir -p
  
 -CC		= gcc
--OPTIM		= -O2
 +#CC		= gcc
-+OPTIM		= $(CFLAGS)
+ OPTIM		= -O2
  
  ###########################################################################
+@@ -36,8 +36,8 @@
+ # Where are Xpm and X11?
  
-@@ -68,10 +71,10 @@
+ # GNU/Linux at home
+-INCDIR		= -I. -I/usr/local/include -I/usr/X11R6/include
+-LIBDIR		= -L. -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11
++INCDIR		= -I. -I${X11BASE}/include
++LIBDIR		= -L. -L${X11BASE}/lib
+ EXTRA_LD_OPT	= 
+ EXTRA_LIBS	= 
+ 
+@@ -68,14 +68,14 @@
  endif
  
  # Alpha at USIT
@@ -48,16 +53,31 @@
  
  ###########################################################################
  
-@@ -87,7 +90,11 @@
+-CCOPT		= -Wall $(OPTIM) $(INCDIR) $(CFLAGS)
++CCOPT		= $(INCDIR) $(CFLAGS)
+ LDOPT		= $(LIBDIR) $(LDFLAGS)
+ 
+ # Object files to store in the library
+@@ -87,7 +87,7 @@
  
  $(LIBTARGET): $(LIBOBJS)
  ifeq ($(SHARED),1)
 -	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
-+ifeq ($(PORTOBJFORMAT),elf)
-+	$(CC) -shared -Wl,-soname,$(LIBTARGET) -o $(LIBTARGET) $(LIBOBJS)
-+else
-+	$(CC) -shared -o $(LIBTARGET) $(LIBOBJS)
-+endif
++	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
  else
  	ar rcs $(LIBTARGET) $(LIBOBJS)
  endif
+@@ -106,12 +106,10 @@
+ 
+ install: $(LIBTARGET)
+ 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+-	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
++	$(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR)
+ 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+ ifeq ($(SHARED),1)
+-	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+ 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+-	echo "If you use GNU/Linux, remember to run ldconfig"
+ endif
+ 
+ depend dep:
-- 
cgit v1.2.3