Configure didn't correctly detect libsnmp when libsnmp required -lcrypto -ldes

- Fix configure to detect if more libraries are required
- Clean up CONFIGURE_ENV while here
- Bump REVISION because you might have installed a version without JetDirect support
  because of this glitch

PR:		ports/54084
Submitted by:	maintainer

4 files changed, 26 insertions, 5 deletions

diff --git a/graphics/hpoj/Makefile b/graphics/hpoj/Makefile
index 4368b29..7a05055 100644
--- a/graphics/hpoj/Makefile
+++ b/graphics/hpoj/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hpoj
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hpoj
@@ -48,8 +49,8 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-mlcd-Makefile.in \
 
 GNU_CONFIGURE=	yes
 # Necessary hacks to find libsnmp:
-CONFIGURE_ENV=	CFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+=	LDFLAGS="-lcipher -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -lcipher -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .ifdef(WITHOUT_X11)
 CONFIGURE_ARGS=	--without-qt
@@ -65,7 +66,7 @@ post-patch:
 .endfor
 	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/scripts/ptal-init.in
 	@${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/scripts/ptal-init.in
-.for f in lib/ptal apps/cmdline lib/sane lib/hpojip
+.for f in lib/ptal lib/sane lib/hpojip
 	@${REINPLACE_CMD} -e 's,CFLAGS=-O,CFLAGS+= @CFLAGS@,' ${WRKSRC}/${f}/Makefile.in
 .endfor
 
diff --git a/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in b/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in
new file mode 100644
index 0000000..a130bae
--- /dev/null
+++ b/graphics/hpoj/files/patch-apps-cmdlind-Makefile.in
@@ -0,0 +1,11 @@
+--- apps/cmdline/Makefile.in.bak	Fri Jun 14 03:49:49 2002
++++ apps/cmdline/Makefile.in	Fri Jul  4 09:40:18 2003
+@@ -5,7 +5,7 @@
+ DISTCLEANS=Makefile
+ INCLUDES=Makefile ../../include/ptal.h ../../include/hpojip.h
+ 
+-CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
++CFLAGS+= @CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @LIBSNMP_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
+ 
+ all:		$(GOALS)
+ 
diff --git a/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in b/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in
index 4b06fa6..18ad319 100644
--- a/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in
+++ b/graphics/hpoj/files/patch-apps-xojpanel-Makefile.in
@@ -6,7 +6,7 @@
  
 -LFLAGS = @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ -lptal
 -CFLAGS = -O -Wall -g -I/usr/X11R6/include @INCLUDE_CMDLINE@
-+LFLAGS += @LDFLAGS@ @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ -lptal
++LFLAGS += @LDFLAGS@ @LIBRARY_CMDLINE@ @LIBQT_CMDLINE@ @LIBSNMP_CMDLINE@ -lptal
 +CFLAGS += @CFLAGS@ -Wall -g @INCLUDE_CMDLINE@
  
  PIXMAPS = hpojlcd.xpm hpoj_lcdmon.xpm hpoj_mini.xpm
diff --git a/graphics/hpoj/files/patch-configure b/graphics/hpoj/files/patch-configure
index ca2d60d..59196c1 100644
--- a/graphics/hpoj/files/patch-configure
+++ b/graphics/hpoj/files/patch-configure
@@ -1,5 +1,5 @@
 --- configure.orig	Thu Aug  8 00:26:38 2002
-+++ configure	Thu Jan 30 17:03:45 2003
++++ configure	Fri Jul  4 09:28:31 2003
 @@ -561,7 +561,7 @@
  # Set up default make subdirectory and install file lists.
  SUBDIRS="lib/hpojip lib/ptal lib/sane mlcd apps/cmdline"
@@ -9,6 +9,15 @@
  includedir_data="include/hpojip.h include/ptal.h"
  
  # Select compilers and utilities.
+@@ -1295,7 +1295,7 @@
+ 	    echo "$ac_t""$dir" 1>&6
+ 
+ 	    for lflagDir in "" "-L$dir/../lib" "-L$dir/../../lib" ; do
+-	      for lflagCrypto in "" "-lcrypto" ; do
++	      for lflagCrypto in "" "-lcrypto" "-lcrypto -ldes" ; do
+ 		unset ac_cv_lib_snmp_snmp_open
+ 		echo $ac_n "checking for snmp_open in -lsnmp""... $ac_c" 1>&6
+ echo "configure:1302: checking for snmp_open in -lsnmp" >&5
 @@ -1597,7 +1597,6 @@
  	if test -n "$QT_MOC" -a -n "$QT_INCLUDE_PATH" -a -n "$LIBQT_CMDLINE" ; then
  		QT_PATH=$dir