diff options
author | Michael Haro <mharo@FreeBSD.org> | 2000-04-01 01:47:00 +0000 |
---|---|---|
committer | Michael Haro <mharo@FreeBSD.org> | 2000-04-01 01:47:00 +0000 |
commit | dad06580ea2dfb5286fde36fd25c36d491348854 (patch) | |
tree | ea930650f091ce2c092f12d672a3f5265a18b86c /x11-toolkits/slingshot | |
parent | - Fix MASTER_SITES (diff) |
- Fix MASTER_SITES
- Support CFLAGS properly
- Support install macros
PR: 17172
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=27217
Diffstat (limited to 'x11-toolkits/slingshot')
-rw-r--r-- | x11-toolkits/slingshot/Makefile | 20 | ||||
-rw-r--r-- | x11-toolkits/slingshot/files/patch-aa | 14 | ||||
-rw-r--r-- | x11-toolkits/slingshot/files/patch-ba | 25 | ||||
-rw-r--r-- | x11-toolkits/slingshot/files/patch-ca | 6 | ||||
-rw-r--r-- | x11-toolkits/slingshot/files/patch-da | 19 | ||||
-rw-r--r-- | x11-toolkits/slingshot/pkg-plist | 4 |
6 files changed, 66 insertions, 22 deletions
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile index edc8f0d1f79b..5e7baa7705c3 100644 --- a/x11-toolkits/slingshot/Makefile +++ b/x11-toolkits/slingshot/Makefile @@ -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$ # @@ -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 --git a/x11-toolkits/slingshot/files/patch-aa b/x11-toolkits/slingshot/files/patch-aa index 7b9561321d5f..000cbc1fa313 100644 --- a/x11-toolkits/slingshot/files/patch-aa +++ b/x11-toolkits/slingshot/files/patch-aa @@ -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 --git a/x11-toolkits/slingshot/files/patch-ba b/x11-toolkits/slingshot/files/patch-ba index 5d7fba48c093..a5aaca885d84 100644 --- a/x11-toolkits/slingshot/files/patch-ba +++ b/x11-toolkits/slingshot/files/patch-ba @@ -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 --git a/x11-toolkits/slingshot/files/patch-ca b/x11-toolkits/slingshot/files/patch-ca index 72e446c4e9a6..1ca1ae1d2c9b 100644 --- a/x11-toolkits/slingshot/files/patch-ca +++ b/x11-toolkits/slingshot/files/patch-ca @@ -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 --git a/x11-toolkits/slingshot/files/patch-da b/x11-toolkits/slingshot/files/patch-da new file mode 100644 index 000000000000..094a41ceb258 --- /dev/null +++ b/x11-toolkits/slingshot/files/patch-da @@ -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 --git a/x11-toolkits/slingshot/pkg-plist b/x11-toolkits/slingshot/pkg-plist index 0b73d8aa5e40..72a9dbb657f8 100644 --- a/x11-toolkits/slingshot/pkg-plist +++ b/x11-toolkits/slingshot/pkg-plist @@ -12,6 +12,8 @@ lib/libsspkg.a 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/appE.ps 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 |