Attachment 65790 Details for Bug 97417 – file.diff

[patch] file.diff

file.diff (text/plain), 3.89 KB, created by Pedro F. Giffuni on 2006-05-17 20:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2006-05-17 20:30:12 UTC

Size: 3.89 KB

patch

obsolete

>diff -ruN slingshot.orig/Makefile slingshot/Makefile
>--- slingshot.orig/Makefile	Wed May 17 11:02:49 2006
>+++ slingshot/Makefile	Wed May 17 14:12:52 2006
>@@ -24,20 +24,12 @@
> USE_GMAKE=	yes
> MAKE_ENV=	OPENWINHOME=${X11BASE}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
>-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
>-.endif
>-
>-pre-patch:
>-	${CP} ${WRKSRC}/config.sunos4x ${WRKSRC}/config.fbsd
>-
> post-install:
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${PREFIX}/share/doc/SlingShot
>-	${INSTALL_DATA} ${WRKSRC}/README  ${PREFIX}/share/doc/SlingShot
>-	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/SlingShot
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR}
>+	${GZIP_CMD} ${DOCSDIR}/README ${DOCSDIR}/*.ps
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN slingshot.orig/files/patch-aa slingshot/files/patch-aa
>--- slingshot.orig/files/patch-aa	Wed May 17 11:02:49 2006
>+++ slingshot/files/patch-aa	Wed May 17 11:31:58 2006
>@@ -49,18 +49,6 @@
>   #
>   # Make.config has things that are needed to build on various platforms.
> ***************
>-*** 35,40 ****
>---- 35,43 ----
>-  	@ if [ -s /vmunix ]; then  \
>-  		echo cp config.sunos4x Make.config ; \
>-  		cp config.sunos4x Make.config ; \
>-+ 	elif [ -s /kernel ]; then  \
>-+ 		echo cp config.fbsd Make.config ; \
>-+ 		cp config.fbsd Make.config ; \
>-  	else  \
>-  		echo cp config.svr4 Make.config ; \
>-  		cp config.svr4 Make.config ; \
>-***************
> *** 45,58 ****
>   
>   clean:
>diff -ruN slingshot.orig/files/patch-ab slingshot/files/patch-ab
>--- slingshot.orig/files/patch-ab	Wed May 17 11:02:49 2006
>+++ slingshot/files/patch-ab	Wed Dec 31 19:00:00 1969
>@@ -1,27 +0,0 @@
>-*** config.fbsd.orig	Sun May  2 16:19:57 1999
>---- config.fbsd	Sun May  2 16:30:41 1999
>-***************
>-*** 1,11 ****
>-  
>-! #	@(#) config.sunos4x 1.6 92/10/27 
>-  
>-! CONFIGPIC		= -pic
>-! CONFIGSHAREDLIBLD	= ld -o $@ -assert pure-text $?
>-  
>-! SHAREDLIB	= $(LIBDIR)/libsspkg.so.1.0
>-! SHAREDLIBDATA	= $(LIBDIR)/libsspkg.sa.1.0
>-  
>-  CONFIGTARGETS	= $(SHAREDLIB) $(SHAREDLIBDATA)
>-  
>---- 1,11 ----
>-  
>-! #	@(#) config.FreeBSD-ELF 1.6 99/10/27 
>-  
>-! CONFIGPIC		= -fpic
>-! CONFIGSHAREDLIBLD	= ld -G -o $@ -h libsspkg.so.1 $? -lm -lc
>-  
>-! SHAREDLIB	= $(LIBDIR)/libsspkg.so.1
>-! SHAREDLIBDATA	= $(LIBDIR)/libsspkg.sa.1
>-  
>-  CONFIGTARGETS	= $(SHAREDLIB) $(SHAREDLIBDATA)
>-  
>diff -ruN slingshot.orig/files/patch-config.svr4 slingshot/files/patch-config.svr4
>--- slingshot.orig/files/patch-config.svr4	Wed Dec 31 19:00:00 1969
>+++ slingshot/files/patch-config.svr4	Wed May 17 11:20:28 2006
>@@ -0,0 +1,11 @@
>+--- config.svr4.orig	Wed May 17 11:15:53 2006
>++++ config.svr4	Wed May 17 11:19:04 2006
>+@@ -1,7 +1,7 @@
>+ 
>+ #	@(#) config.svr4 1.7 92/10/27 
>+ 
>+-CONFIGPIC		= -Kpic
>++CONFIGPIC		= -fPIC
>+ CONFIGSHAREDLIBLD	= ld -G -o $@ -h libsspkg.so.1 $? -lm -lc;
>+ 
>+ SHAREDLIB		= $(LIBDIR)/libsspkg.so.1
>diff -ruN slingshot.orig/pkg-plist slingshot/pkg-plist
>--- slingshot.orig/pkg-plist	Wed May 17 11:02:49 2006
>+++ slingshot/pkg-plist	Wed May 17 14:13:10 2006
>@@ -11,14 +11,14 @@
> lib/libsspkg.a
> lib/libsspkg.so
> lib/libsspkg.so.1
>-%%PORTDOCS%%share/doc/SlingShot/README
>-%%PORTDOCS%%share/doc/SlingShot/appA.ps
>-%%PORTDOCS%%share/doc/SlingShot/appB.ps
>-%%PORTDOCS%%share/doc/SlingShot/appC.ps
>-%%PORTDOCS%%share/doc/SlingShot/appD.ps
>-%%PORTDOCS%%share/doc/SlingShot/appE.ps
>-%%PORTDOCS%%share/doc/SlingShot/ch1.ps
>-%%PORTDOCS%%share/doc/SlingShot/ch2.ps
>-%%PORTDOCS%%share/doc/SlingShot/ch3.ps
>-%%PORTDOCS%%@dirrm share/doc/SlingShot
>+%%PORTDOCS%%%%DOCSDIR%%/README.gz
>+%%PORTDOCS%%%%DOCSDIR%%/appA.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/appB.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/appC.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/appD.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/appE.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/ch1.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/ch2.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/ch3.ps.gz
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm include/sspkg

Actions: View | Diff

Attachments on bug 97417: 65790