- Support CFLAGS/CXXFLAGS properly

- Utilize NOPORTDOCS

PR:		42897
Submitted by:	Ports Fury

4 files changed, 40 insertions, 13 deletions

diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index 13f8ee21ed1a..bde19236f42e 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ccrypt
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://quasar.mathstat.uottawa.ca/~selinger/ccrypt/download/
@@ -15,11 +16,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 
 MAN1=	ccrypt.1
@@ -28,6 +29,12 @@ MLINKS=	ccrypt.1 ccencrypt.1 \
 	ccrypt.1 ccat.1
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,gtar,tar,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|gtar|tar|g' ${WRKSRC}/configure
+
+post-install:
+.if !defined(NOPORTDOCS) 
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/ccrypt/files/patch-doc::Makefile.in b/security/ccrypt/files/patch-doc::Makefile.in
index 5fb2e733519f..62eef0774cad 100644
--- a/security/ccrypt/files/patch-doc::Makefile.in
+++ b/security/ccrypt/files/patch-doc::Makefile.in
@@ -1,11 +1,20 @@
---- doc/Makefile.in.orig	Thu Feb  7 09:08:51 2002
-+++ doc/Makefile.in	Thu Feb  7 09:09:31 2002
-@@ -75,7 +75,7 @@
+--- doc/Makefile.in.orig	Wed Jan 30 14:15:42 2002
++++ doc/Makefile.in	Sun Sep 15 09:24:14 2002
+@@ -195,7 +195,7 @@
+ install-exec-am:
+ install-exec: install-exec-am
  
- EXTRA_DIST = ccrypt.1.in man2html.sed cypfaq01.txt
+-install-data-am: install-man install-htmlDATA
++install-data-am: install-man # install-htmlDATA
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+@@ -210,7 +210,7 @@
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(htmldir)
++	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 # $(DESTDIR)$(htmldir)
  
--htmldir = $(prefix)/doc/ccrypt
-+htmldir = $(prefix)/share/doc/ccrypt
- 
- DISTCLEANFILES = ccrypt.ps ccrypt.html
  
+ mostlyclean-generic:
diff --git a/security/ccrypt/files/patch-src::Makefile.in b/security/ccrypt/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..b52490fbd4fb
--- /dev/null
+++ b/security/ccrypt/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Jan 30 14:15:42 2002
++++ src/Makefile.in	Sun Sep 15 09:26:45 2002
+@@ -76,7 +76,7 @@
+ VERSION = @VERSION@
+ lispdir = @lispdir@
+ 
+-CFLAGS = -O3
++CFLAGS = @CFLAGS@
+ 
+ bin_PROGRAMS = ccrypt
+ noinst_PROGRAMS = maketables
diff --git a/security/ccrypt/pkg-plist b/security/ccrypt/pkg-plist
index 7a57399c2bed..cb11af801e87 100644
--- a/security/ccrypt/pkg-plist
+++ b/security/ccrypt/pkg-plist
@@ -2,5 +2,5 @@ bin/ccat
 bin/ccdecrypt
 bin/ccencrypt
 bin/ccrypt
-share/doc/ccrypt/ccrypt.html
-@dirrm share/doc/ccrypt
+%%PORTDOCS%%share/doc/ccrypt/ccrypt.html
+%%PORTDOCS%%@dirrm share/doc/ccrypt