 @@ -1,73 +1,74 @@
-# $NetBSD: Makefile,v 1.43 2009/12/17 20:58:25 abs Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/25 21:05:57 joerg Exp $
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
 PKGREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
 EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 COMMENT=	General-purpose circuit simulation program
 PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}
 # GPL license used by GNU readline is not compatible
 # with 4 clause BSD license used by spice.
 #BUILDLINK_API_DEPENDS.readline=	readline>=4.0
 #USE_GNU_READLINE=	uses rl_* interface
 # documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
 #		These are included as patch-ae
 #PATCH_SITES=	ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/
 #PATCHFILES=	grid.patch newcoms.patch spsmp.patch
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
 MAKE_ENV+=	WRKSRC=${WRKSRC:Q}
 post-extract:
 	${CP} ${FILESDIR}/NetBSD ${WRKSRC}/conf
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	conf/NetBSD conf/defaults
 SUBST_VARS.conf=	MAKE_PROGRAM CFLAGS LDFLAGS WRKSRC PREFIX X11BASE
 do-configure:
 	rm -f ${WRKSRC}/makefile
 do-build:
 	cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD default
 INSTALLATION_DIRS+=share/examples/spice3
 do-install:
-	cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD install
+	cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} util/build NetBSD install
-	${CHMOD} a+rx ${PREFIX}/bin/spice3		\
+	${CHMOD} a+rx ${DESTDIR}${PREFIX}/bin/spice3	\
 		${DESTDIR}${PREFIX}/bin/nutmeg		\
 	  	${DESTDIR}${PREFIX}/bin/sconvert	\
 		${DESTDIR}${PREFIX}/bin/help		\
 		${DESTDIR}${PREFIX}/bin/proc2mod	\
 		${DESTDIR}${PREFIX}/bin/multidec
 	strip ${DESTDIR}${PREFIX}/bin/spice3		\
 		${DESTDIR}${PREFIX}/bin/nutmeg		\
 		${DESTDIR}${PREFIX}/bin/sconvert	\
 		${DESTDIR}${PREFIX}/bin/help		\
 		${DESTDIR}${PREFIX}/bin/proc2mod	\
 		${DESTDIR}${PREFIX}/bin/multidec
 	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/spice3
 	${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/mfbcap.5
 	${INSTALL_MAN} ${WRKSRC}/man/man1/sconvert.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sconvert.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/nutmeg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nutmeg.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/spice.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/spice.1
 	${INSTALL_MAN} ${WRKSRC}/man/man3/mfb.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/mfb.3
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${DESTDIR}${PREFIX}/share/examples/spice3
 #.include "../../devel/readline/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,28 +1,28 @@
-$NetBSD: distinfo,v 1.10 2007/03/07 14:59:06 joerg Exp $
+$NetBSD: distinfo,v 1.11 2010/06/25 21:05:57 joerg Exp $
 SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e
 RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c
 Size (sp3f4.kit.tar.Z) = 2086528 bytes
 SHA1 (patch-aa) = e02c604b9d32b395dd8d7ac22255c96229fff72a
 SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496
 SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488
 SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4
 SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d
 SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
-SHA1 (patch-ag) = d03a660e2e1f96eb4b5edb71c32fb0b44cc7921e
+SHA1 (patch-ag) = a2a7ba21feb905f4d9cb6387f42329fccc4e168f
 SHA1 (patch-ah) = 2c1f4f135cbba8e7159be4ae811e54e5464cbdda
 SHA1 (patch-ai) = 7e94175896b98f17f43338a05ed993657d4cc844
 SHA1 (patch-aj) = 6229e4066ab8bfba8b29bcc1260d75563637a784
 SHA1 (patch-ak) = f7e630445f87514e58221e0e10ae17cb4b532849
 SHA1 (patch-al) = 4b27e02d8e6c74cb2ba6608d86f58fda891c6735
 SHA1 (patch-am) = f80ff5cc36abdf0780f87ecdacce73ccd4abd395
 SHA1 (patch-an) = f0b06bf671f4370dedfe3693bfcd5461ddcccf24
 SHA1 (patch-ao) = 6701fc535be7f3ab3d6287b42af7b15e63980189
 SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f
 SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3
 SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27
 SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d
 SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac
 SHA1 (patch-au) = 5b69fde30ec2cc301b970e2c40d83fac1b00c874
 SHA1 (patch-av) = 9828210e621310023e059e4fc7f8f1c5d1c7e187
 SHA1 (patch-aw) = 6bbc7e279d92def9ca90b5544b2777b7f221071a

 @@ -1,61 +1,61 @@
-$NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $
+$NetBSD: patch-ag,v 1.5 2010/06/25 21:05:57 joerg Exp $
 --- conf/defaults.orig	Thu Jul 29 17:33:56 1993
 +++ conf/defaults
 @@ -65,7 +65,7 @@
  #	the following definition:
  #		SYS_DIR		= $(DIST_DIR)
 -SYS_DIR		= $(TOP1)/$(SYSTEM)
 +SYS_DIR		= $(TOP0)/$(SYSTEM)
  #	OBJ_TOP is the directory in which intermidiate files reside
  #	These are ".o" files, synthesized ".c" files, ".a" files,
 @@ -105,12 +105,12 @@
  #	identified as and SYSTEM is the name of the per-system definitions
  #	file listed on the "build" command line.
 -SPICE_DIR	= $(TOP1)/$(SYSTEM)
 -SPICE_LIB_DIR	= $(SPICE_DIR)/lib
-+SPICE_DIR	= @PREFIX@
++SPICE_DIR	= ${DESTDIR}@PREFIX@
 +SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
  S_SPICE_DIR	= $(SPICE_DIR)
 -S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
 +S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  #	INSTALL_DIRS lists the directories that need to be created before
 @@ -129,11 +129,11 @@
  #	an extra definition to work around the same strange bug.  See either
  #	file "conf/vax" or "conf/gcc".
 -CC		= cc
 +CC		= gcc
  #	CC_OPT: Default compile options (optimization/debug level, other)
 -CC_OPT		= -O
 +CC_OPT		= -O2 -pipe
  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
  #	which typically causes problems for most compilers (bsim1 and bsim2).
 @@ -203,7 +203,7 @@
  #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
  #	a convenience that is used in the following definitions.
 -X_DIR		= /usr
 +X_DIR		= @X11BASE@
  #	INCX lists the X include directories.  This may be different between
  #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
 @@ -218,7 +218,7 @@
  #	which is not available with all versions of X11.  If you do not have
  #	it, then you do not need it (delete the following reference to it).
 -LIBX		= -L$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lX11
 +LIBX		= -L$(X_DIR)/lib -Wl,-R@X11BASE@/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11