From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 17 19:30:14 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D78416A699 for ; Wed, 17 May 2006 19:30:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B40343D45 for ; Wed, 17 May 2006 19:30:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4HJUD2f015927 for ; Wed, 17 May 2006 19:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4HJUDeP015923; Wed, 17 May 2006 19:30:13 GMT (envelope-from gnats) Resent-Date: Wed, 17 May 2006 19:30:13 GMT Resent-Message-Id: <200605171930.k4HJUDeP015923@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pedro F. Giffuni" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7236116A8D5 for ; Wed, 17 May 2006 19:22:24 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 369F443D46 for ; Wed, 17 May 2006 19:22:24 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k4HJMMD1066174 for ; Wed, 17 May 2006 19:22:22 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k4HJMMCp066173; Wed, 17 May 2006 19:22:22 GMT (envelope-from nobody) Message-Id: <200605171922.k4HJMMCp066173@www.freebsd.org> Date: Wed, 17 May 2006 19:22:22 GMT From: "Pedro F. Giffuni" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/97417: Cleanup x11-toolkits/slingshot (fix on amd64) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:30:14 -0000 >Number: 97417 >Category: ports >Synopsis: Cleanup x11-toolkits/slingshot (fix on amd64) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 17 19:30:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.1-Release >Organization: >Environment: FreeBSD etoile.cable.net.co 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Fri May 12 00:18:58 COT 2006 root@etoile.cable.net.co:/usr/src/sys/amd64/compile/DIMENSION amd64 >Description: I cleaned the build procedure: - it now builds on amd64 and others - use DOCSDIR - compress documentation with gzip. >How-To-Repeat: >Fix: Patch follows: 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 - -.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 +.include 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 >Release-Note: >Audit-Trail: >Unformatted: