- Fix a typo in PORTREVISION. Doh!

- Manually replace included copies of config.guess and config.sub with
  versions from ${PORTSDIR}/Templates. This is necessary as the sformat
  package doesn't have a valid configure script in it's root directory
  but one in a sub-directory that is executed by the SING (Schily Is
  Not Gnu) makefile system further down the road. Therefor the port
  can't set GNU_CONFIGURE which would automatically copy the relevant
  files.
- Remove BSD_SCSI_SENSE_BUG from COPTX (CFLAGS) to libscg. It is a
  workaround for a (probably alumnus) bug in a SCSI-driver of NetBSD
  and the affected code doesn't get compiled on neither pre-CAM nor
  CAM versions of FreeBSD.
- Use DATADIR in pkg-plist.

Submitted by:	maintainer

2 files changed, 7 insertions, 4 deletions

diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 7d68d0578d1a..97ec1ea94b44 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sformat
 PORTVERSION=	3.5
-PORTREVISON=	2
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zeist.de/pub/distfiles/ \
 		ftp://ftp.berlios.de/pub/sformat/
@@ -20,9 +20,12 @@ USE_REINPLACE=	yes
 
 MAN1=		sformat.1
 
-MAKE_ENV=	CCOM=${CC} COPTX="-DBSD_SCSI_SENSE_BUG"
+MAKE_ENV=	CCOM=${CC}
 
 post-extract:
+.for i in config.guess config.sub
+	@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf
+.endfor
 .if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
 	@${LN} -s ${WRKSRC}/RULES/i386-freebsd-cc.rul \
 		${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
diff --git a/sysutils/sformat/pkg-plist b/sysutils/sformat/pkg-plist
index ccdc19f1d2b2..b58af0985e36 100644
--- a/sysutils/sformat/pkg-plist
+++ b/sysutils/sformat/pkg-plist
@@ -1,3 +1,3 @@
 bin/sformat
-share/sformat/sformat.dat
-@dirrm share/sformat
+%%DATADIR%%/sformat.dat
+@dirrm %%DATADIR%%