Date: Fri, 3 Mar 2000 13:22:54 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17172: Update port: x11-toolkits/slingshot Message-ID: <200003032122.NAA64207@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17172 >Category: ports >Synopsis: Update port: x11-toolkits/slingshot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 3 13:30:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - Fix MASTER_SITES - Support CFLAGS properly - Support install macros New file: patches/patch-da >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/slingshot/Makefile x11-toolkits/slingshot/Makefile --- /usr/ports/x11-toolkits/slingshot/Makefile Tue Aug 31 19:19:31 1999 +++ x11-toolkits/slingshot/Makefile Sat Mar 4 03:58:57 2000 @@ -1,7 +1,7 @@ -# New ports collection makefile for: SlingShot -# Version required: 2.1 -# Date created: 5 March 1997 -# Whom: Pedro Giffuni +# New ports collection makefile for: SlingShot +# Version required: 2.1 +# Date created: 5 March 1997 +# Whom: Pedro Giffuni # # $FreeBSD: ports/x11-toolkits/slingshot/Makefile,v 1.9 1999/08/31 02:59:35 peter Exp $ # @@ -9,24 +9,26 @@ DISTNAME= SlingShot2.1 PKGNAME= slingshot-2.1 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ +MASTER_SITES= ftp://ftp.x.org/R5contrib/ \ + ftp://ftp.freesoftware.com/pub/X11/R5contrib/ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -WRKSRC= $(WRKDIR)/sspkg2.1 +WRKSRC= ${WRKDIR}/sspkg2.1 USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV= OPENWINHOME=$(X11BASE) +MAKE_ENV= OPENWINHOME=${X11BASE} pre-patch: - ${CP} $(WRKSRC)/config.sunos4x $(WRKSRC)/config.fbsd + ${CP} ${WRKSRC}/config.sunos4x ${WRKSRC}/config.fbsd post-install: + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/SlingShot + @${MKDIR} ${PREFIX}/share/doc/SlingShot ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/SlingShot ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/SlingShot .endif diff -urN /usr/ports/x11-toolkits/slingshot/patches/patch-aa x11-toolkits/slingshot/patches/patch-aa --- /usr/ports/x11-toolkits/slingshot/patches/patch-aa Wed Jun 4 07:53:07 1997 +++ x11-toolkits/slingshot/patches/patch-aa Sat Mar 4 04:18:20 2000 @@ -1,5 +1,5 @@ -*** Makefile.orig Thu Apr 24 20:12:18 1997 ---- Makefile Thu Apr 24 20:30:17 1997 +*** Makefile.orig Wed Nov 3 04:18:39 1993 +--- Makefile Sat Mar 4 04:17:25 2000 *************** *** 2,8 **** # @(#) Makefile 1.21 93/10/25 @@ -61,7 +61,7 @@ echo cp config.svr4 Make.config ; \ cp config.svr4 Make.config ; \ *************** -*** 45,57 **** +*** 45,58 **** clean: -sccs clean @@ -72,10 +72,11 @@ ! install: $(INSTALL_DIR) FORCE ! (cd $(INCLUDEDIR); make install INSTALL_DIR=$(INSTALL_DIR)) - (cp $(LIBDIR)/* $(INSTALL_DIR)/lib) +! (cp $(LIBDIR)/* $(INSTALL_DIR)/lib) -ranlib $(INSTALL_DIR)/lib/libsspkg.a -ranlib $(INSTALL_DIR)/lib/libsspkg.sa.* ---- 48,60 ---- + (cd $(INSTALL_DIR)/lib; rm -f libsspkg.so; ln -s libsspkg.so.* libsspkg.so) +--- 48,61 ---- clean: -sccs clean @@ -86,6 +87,7 @@ ! install: all $(INSTALL_DIR) FORCE ! (cd $(INCLUDEDIR); $(MAKE) install INSTALL_DIR=$(INSTALL_DIR)) - (cp $(LIBDIR)/* $(INSTALL_DIR)/lib) +! (${BSD_INSTALL_DATA} $(LIBDIR)/* $(INSTALL_DIR)/lib) -ranlib $(INSTALL_DIR)/lib/libsspkg.a -ranlib $(INSTALL_DIR)/lib/libsspkg.sa.* + (cd $(INSTALL_DIR)/lib; rm -f libsspkg.so; ln -s libsspkg.so.* libsspkg.so) diff -urN /usr/ports/x11-toolkits/slingshot/patches/patch-ba x11-toolkits/slingshot/patches/patch-ba --- /usr/ports/x11-toolkits/slingshot/patches/patch-ba Wed Jun 4 07:53:07 1997 +++ x11-toolkits/slingshot/patches/patch-ba Sat Mar 4 04:18:35 2000 @@ -1,5 +1,5 @@ -*** src/Makefile.orig Mon Oct 25 13:37:43 1993 ---- src/Makefile Wed Apr 30 00:40:56 1997 +*** src/Makefile.orig Tue Oct 26 03:37:43 1993 +--- src/Makefile Sat Mar 4 04:17:50 2000 *************** *** 15,22 **** @@ -14,8 +14,27 @@ INCDIR = $(SSPKGHOME)/include/sspkg PRIVATEINCDIR = $(SSPKGHOME)/src -! CFLAGS = -O -DNO_SINCOS +! CFLAGS += -DNO_SINCOS ! #CFLAGS = -g CPPFLAGS = -I$(SSPKGHOME)/include -I$(PRIVATEINCDIR) -I$(OPENWINHOME)/include + + +*************** +*** 112,119 **** + + + install: $(STATICLIBRARY) $(SHAREDLIB) FORCE +! cp $(STATICLIBRARY) $(INSTALL_DIR)/lib +! cp $(SHAREDLIB) $(INSTALL_DIR)/lib + ln -s $(SHAREDLIB) $(INSTALLDIR)/libsspkg.so + + +--- 112,119 ---- + + + install: $(STATICLIBRARY) $(SHAREDLIB) FORCE +! ${BSD_INSTALL_DATA} $(STATICLIBRARY) $(INSTALL_DIR)/lib +! ${BSD_INSTALL_DATA} $(SHAREDLIB) $(INSTALL_DIR)/lib + ln -s $(SHAREDLIB) $(INSTALLDIR)/libsspkg.so diff -urN /usr/ports/x11-toolkits/slingshot/patches/patch-ca x11-toolkits/slingshot/patches/patch-ca --- /usr/ports/x11-toolkits/slingshot/patches/patch-ca Wed Jun 4 07:53:07 1997 +++ x11-toolkits/slingshot/patches/patch-ca Sat Mar 4 03:46:57 2000 @@ -1,5 +1,5 @@ *** examples/Makefile.orig Tue Nov 2 14:18:49 1993 ---- examples/Makefile Wed Apr 30 00:42:39 1997 +--- examples/Makefile Sat Mar 4 18:44:23 2000 *************** *** 1,5 **** @@ -106,8 +106,8 @@ SSPKGLIB = $(SSPKGHOME)/lib/libsspkg.a -! DBXFLAGS = -O -! CFLAGS = $(DBXFLAGS) -I$(SSPKGHOME)/../include -I$(OPENWINHOME)/include +! #DBXFLAGS = -g +! CFLAGS += $(DBXFLAGS) -I$(SSPKGHOME)/../include -I$(OPENWINHOME)/include LDFLAGS = -L$(LIBDIR) $(LIBS) $(SSPKGLIB) -lm all: icons array_tile clockobj color color2 \ diff -urN /usr/ports/x11-toolkits/slingshot/patches/patch-da x11-toolkits/slingshot/patches/patch-da --- /usr/ports/x11-toolkits/slingshot/patches/patch-da Thu Jan 1 09:00:00 1970 +++ x11-toolkits/slingshot/patches/patch-da Sat Mar 4 05:08:48 2000 @@ -0,0 +1,19 @@ +*** include/sspkg/Makefile.orig Sat Oct 23 02:34:35 1993 +--- include/sspkg/Makefile Sat Mar 4 05:05:40 2000 +*************** +*** 13,19 **** + -sccs clean + + install: FORCE +! cp $(INCLUDEFILES) $(INSTALL_DIR)/include/sspkg + + FORCE: + +--- 13,19 ---- + -sccs clean + + install: FORCE +! ${BSD_INSTALL_DATA} $(INCLUDEFILES) $(INSTALL_DIR)/include/sspkg + + FORCE: + diff -urN /usr/ports/x11-toolkits/slingshot/pkg/PLIST x11-toolkits/slingshot/pkg/PLIST --- /usr/ports/x11-toolkits/slingshot/pkg/PLIST Wed May 5 19:45:56 1999 +++ x11-toolkits/slingshot/pkg/PLIST Sat Mar 4 03:57:54 2000 @@ -12,6 +12,8 @@ lib/libsspkg.sa.1 lib/libsspkg.so lib/libsspkg.so.1 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/SlingShot/README share/doc/SlingShot/appA.ps share/doc/SlingShot/appB.ps @@ -21,5 +23,5 @@ share/doc/SlingShot/ch1.ps share/doc/SlingShot/ch2.ps share/doc/SlingShot/ch3.ps -@dirrm include/sspkg @dirrm share/doc/SlingShot +@dirrm include/sspkg >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003032122.NAA64207>