summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1998-06-11 14:51:54 +0000
committerhubertf <hubertf@pkgsrc.org>1998-06-11 14:51:54 +0000
commita8f3e2682340ef5587258c1ee98a73f74c4a4e97 (patch)
treeadf7cbe649f3e257fba66a9b022816f25213d6fe /cad
parent9bc476a12c1cceb9254ff05ee3ad16ec0ace589d (diff)
downloadpkgsrc-a8f3e2682340ef5587258c1ee98a73f74c4a4e97.tar.gz
Rework for NetBSD
Diffstat (limited to 'cad')
-rw-r--r--cad/spice/Makefile44
-rw-r--r--cad/spice/files/Makefile18
-rw-r--r--cad/spice/files/NetBSD (renamed from cad/spice/files/FreeBSD)2
-rw-r--r--cad/spice/patches/patch-aa12
-rw-r--r--cad/spice/pkg/PLIST1
-rw-r--r--cad/spice/scripts/configure5
6 files changed, 45 insertions, 37 deletions
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 919b27d1ac6..dfe523294bb 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: spice
-# Version required: 3f5
-# Date created: 26 Mar 96
-# Whom: Julian Jenkins <kaveman@magna.com.au>
-#
-# $Id: Makefile,v 1.1.1.1 1998/06/11 14:39:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/06/11 14:51:54 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
#
DISTNAME= sp3f4.kit
@@ -25,10 +21,44 @@ MAN1= sconvert.1 nutmeg.1 spice.1
MAN3= mfb.3
MAN5= mfbcap.5
+do-configure:
+ ${RM} -f ${WRKSRC}/makefile
+ sed 's@$${X11BASE}@${X11BASE}@' <${FILESDIR}/NetBSD >${WRKSRC}/conf/NetBSD
+ ${MV} ${WRKSRC}/conf/defaults ${WRKSRC}/conf/defaults.BAK
+ sed \
+ -e 's@$${X11BASE}@${X11BASE}@' \
+ -e 's@$${PREFIX}@${PREFIX}@' \
+ <${WRKSRC}/conf/defaults.BAK >${WRKSRC}/conf/defaults
+
+do-build:
+ cd ${WRKSRC} ; util/build NetBSD default
+
+do-install:
+ cd ${WRKSRC} ; util/build NetBSD install
+ chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
+ ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
+ ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
+ strip ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
+ ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
+ ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
+ chmod -R a+rX ${PREFIX}/share/spice3
+ ${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5
+ ${INSTALL_MAN} ${WRKSRC}/man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1
+ ${INSTALL_MAN} ${WRKSRC}/man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1
+ ${INSTALL_MAN} ${WRKSRC}/man/man1/spice.1 ${PREFIX}/man/man1/spice.1
+ ${INSTALL_MAN} ${WRKSRC}/man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/examples/spice3
${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3
.endif
-.include <bsd.port.mk>
+
+.include "../../mk/bsd.pkg.mk"
+
+
+x:
+.if exists(${PACKAGES})
+ ls -lad ${PACKAGES}
+.endif
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
deleted file mode 100644
index 6ca93e2439f..00000000000
--- a/cad/spice/files/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-all:
- util/build FreeBSD default
-
-install:
- util/build FreeBSD install
- chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
- ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
- ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
- strip ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
- ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
- ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
- chmod -R a+rX ${PREFIX}/share/spice3
- install -c -m 644 -o bin -g bin man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5
- install -c -m 644 -o bin -g bin man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1
- install -c -m 644 -o bin -g bin man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1
- install -c -m 644 -o bin -g bin man/man1/spice.1 ${PREFIX}/man/man1/spice.1
- install -c -m 644 -o bin -g bin man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
diff --git a/cad/spice/files/FreeBSD b/cad/spice/files/NetBSD
index 9639ab93fd9..ee4b0b32168 100644
--- a/cad/spice/files/FreeBSD
+++ b/cad/spice/files/NetBSD
@@ -5,6 +5,6 @@ INTERFACE_OPTS = -DWANT_X11
CC = gcc
CC_OPT = -O2 -pipe
CC_OPT_SAFE = -O2 -fno-strength-reduce -pipe
-LDFLAGS = -L$(X11BASE)/lib -lm -ltermcap
+LDFLAGS = -L${X11BASE}/lib -lm -ltermcap
ASM_HACK = < /dev/null
SYS_CFLAGS = -Dbsd
diff --git a/cad/spice/patches/patch-aa b/cad/spice/patches/patch-aa
index 8e423df0cf3..6faa5aa343d 100644
--- a/cad/spice/patches/patch-aa
+++ b/cad/spice/patches/patch-aa
@@ -113,7 +113,7 @@
long x;
SIGNAL_TYPE (*orig_signal)( );
-+ #ifndef __FreeBSD__
++ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
if (getenv("SPICE_NO_DATASEG_CHECK"))
+ #endif
return 0;
@@ -127,7 +127,7 @@
extern char *realloc();
extern char *getenv();
extern int errno;
-+ #ifndef __FreeBSD__
++ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
extern char *sys_errlist[];
+ #endif
extern char *getenv();
@@ -139,14 +139,14 @@
# endif /* clearerr */
# endif /* HAS_CLEARERR */
-+ #ifndef __FreeBSD__
++ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
# ifndef bzero
extern int bzero();
# endif
# ifndef bcopy
extern void bcopy();
# endif
-+ #endif /* __FreeBSD__ */
++ #endif /* defined(__FreeBSD__) || defined(__NetBSD__) */
# ifndef index
# ifdef HAS_INDEX
@@ -170,7 +170,7 @@
#include "os_unix.h"
-+ #ifndef __FreeBSD__
++ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
#define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
#define HAS_FTIME /* ftime( ), <times.h> */
+ #define HAS_INDEX /* index( ) instead of strchr( ) */
@@ -194,7 +194,7 @@
#define HAS_DUP2
#define HAS_GETWD /* getwd(buf) */
!
-! #ifdef __FreeBSD__
+! #if defined(__FreeBSD__) || defined(__NetBSD__)
! #define HAS_BSDSOCKETS /* <net/inet.h>, socket( ), etc. */
! #define HAS_BSDTIME /* gettimeofday( ) return time */
! #define HAS_FLOAT_H /* float.h */
diff --git a/cad/spice/pkg/PLIST b/cad/spice/pkg/PLIST
index f68f6dd8faa..74ba499a4d9 100644
--- a/cad/spice/pkg/PLIST
+++ b/cad/spice/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1998/06/11 14:51:55 hubertf Exp $
bin/spice3
bin/nutmeg
bin/sconvert
diff --git a/cad/spice/scripts/configure b/cad/spice/scripts/configure
deleted file mode 100644
index a7a9c4a1c07..00000000000
--- a/cad/spice/scripts/configure
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-rm -f ${WRKSRC}/makefile
-cp ${FILESDIR}/Makefile ${WRKSRC}/Makefile
-cp ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD \ No newline at end of file