- fix building problem and unbreak this port

- remove redundant declaration in makefile.conf and use MAKE_ENV directly
- utilize DATADIR in pkg-plist

Noticed by:	kris

4 files changed, 27 insertions, 23 deletions

diff --git a/security/smtpmap/Makefile b/security/smtpmap/Makefile
index d278876e65b9..5d08a40a1f60 100644
--- a/security/smtpmap/Makefile
+++ b/security/smtpmap/Makefile
@@ -14,10 +14,7 @@ MASTER_SITES=	http://plasmahh.hopto.org/
 MAINTAINER=	hubert@frbsd.org
 COMMENT=	An SMTP software identifier
 
-.if !exists(/usr/include/getopt.h)
-MAKE_ENV=	LIBS="${LDFLAGS}" INC="${CPPFLAGS}"
-.endif
-
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
@@ -25,16 +22,7 @@ USE_GMAKE=	yes
 USE_GCC=	2.95
 MAKEFILE=	makefile
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		-e 's|g++|${CXX}|g' ${WRKSRC}/makefile.conf
 	@${REINPLACE_CMD} -e 's|-j 5||g' ${WRKSRC}/makefile
 
 do-install:
@@ -44,4 +32,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/share/${file} ${DATADIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/smtpmap/files/patch-makefile.conf b/security/smtpmap/files/patch-makefile.conf
index ce4e0b7d5d30..8a81166b4a97 100644
--- a/security/smtpmap/files/patch-makefile.conf
+++ b/security/smtpmap/files/patch-makefile.conf
@@ -1,15 +1,15 @@
 --- makefile.conf.orig	Thu Oct 31 23:37:00 2002
 +++ makefile.conf	Tue Jun 17 01:20:41 2003
-@@ -4,9 +4,8 @@
+@@ -4,9 +4,6 @@
  # Internal Configuration, do not touch
  TMPDIR=.smtpmap-$(VERSION)
- CC=g++
+-CC=g++
 -#CFLAGS=-O -Wall -pg -g -D_PREFIX=\"$(PREFIX)\"
- CFLAGS=-O -Wall -g3 -D_PREFIX=\"$(PREFIX)\"
+-CFLAGS=-O -Wall -g3 -D_PREFIX=\"$(PREFIX)\"
 -INC=-I ../include
 -LIBS=
++CC=$(CXX)
++CFLAGS+=-D_PREFIX=\"$(PREFIX)\"
 +INC+=-I../include -I/usr/include
  DEPFLAG=-M $(INC)
 -PREFIX=/usr
-+PREFIX=%%PREFIX%%
-+LOCALBASE=%%LOCALBASE%%
diff --git a/security/smtpmap/files/patch-src::makefile b/security/smtpmap/files/patch-src::makefile
new file mode 100644
index 000000000000..0052fdb716ec
--- /dev/null
+++ b/security/smtpmap/files/patch-src::makefile
@@ -0,0 +1,16 @@
+--- src/makefile.orig	Wed Aug 14 22:12:02 2002
++++ src/makefile	Sun Oct 24 10:39:46 2004
+@@ -5,11 +5,11 @@
+ include $(TOPDIR)/makefile.conf
+ 
+ all smtpmap-sub: small_socket.o mstring.o mfile.o scanner_smtp.o smtpmap.o fp_return.o fp_rfc.o fp.o fp_conf.o scanner_server.o
+-	$(CC) $(CFLAGS) $(INC) small_socket.o mstring.o mfile.o scanner_smtp.o fp_return.o fp_rfc.o fp.o fp_conf.o scanner_server.o smtpmap.o -o smtpmap
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INC) small_socket.o mstring.o mfile.o scanner_smtp.o fp_return.o fp_rfc.o fp.o fp_conf.o scanner_server.o smtpmap.o -o smtpmap
+ 
+ 
+ %.o:%.cpp
+-	$(CC) $(CFLAGS) $(INC) -c $*.cpp
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC) -c $*.cpp
+ 
+ clean::
+ 	@echo Cleaning up
diff --git a/security/smtpmap/pkg-plist b/security/smtpmap/pkg-plist
index 85a4f9adafdf..882ace694504 100644
--- a/security/smtpmap/pkg-plist
+++ b/security/smtpmap/pkg-plist
@@ -1,5 +1,5 @@
 bin/smtpmap
-share/smtpmap/fingerprints-conf
-share/smtpmap/fingerprints-return
-share/smtpmap/fingerprints-rfc
-@dirrm share/smtpmap
+%%DATADIR%%/fingerprints-conf
+%%DATADIR%%/fingerprints-return
+%%DATADIR%%/fingerprints-rfc
+@dirrm %%DATADIR%%