Date: Fri, 4 Jul 2003 10:12:22 +0200 (CEST) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54084: [maintainer] graphics/hpoj: Correctly detect if libsnmp needs -lcrypto Message-ID: <200307040812.h648CM6O062520@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200307040820.h648K5LC084526@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54084
>Category: ports
>Synopsis: [maintainer] graphics/hpoj: Correctly detect if libsnmp needs -lcrypto
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 04 01:20:05 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.8-STABLE FreeBSD 4.8-STABLE #5: Mon Jun 23 10:24:06 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
Configure didn't correctly detect libsnmp when libsnmp required -lcrypto -ldes
>How-To-Repeat:
>Fix:
- 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
--- hpoj begins here ---
diff -urN hpoj.orig/Makefile hpoj/Makefile
--- hpoj.orig/Makefile Tue Jun 17 21:59:06 2003
+++ hpoj/Makefile Fri Jul 4 10:05:41 2003
@@ -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 @@
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 @@
.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 -urN hpoj.orig/files/patch-apps-cmdlind-Makefile.in hpoj/files/patch-apps-cmdlind-Makefile.in
--- hpoj.orig/files/patch-apps-cmdlind-Makefile.in Thu Jan 1 01:00:00 1970
+++ hpoj/files/patch-apps-cmdlind-Makefile.in Fri Jul 4 09:45:03 2003
@@ -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 -urN hpoj.orig/files/patch-apps-xojpanel-Makefile.in hpoj/files/patch-apps-xojpanel-Makefile.in
--- hpoj.orig/files/patch-apps-xojpanel-Makefile.in Tue May 20 09:41:02 2003
+++ hpoj/files/patch-apps-xojpanel-Makefile.in Fri Jul 4 09:46:25 2003
@@ -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 -urN hpoj.orig/files/patch-configure hpoj/files/patch-configure
--- hpoj.orig/files/patch-configure Tue May 20 09:41:02 2003
+++ hpoj/files/patch-configure Fri Jul 4 09:47:11 2003
@@ -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
--- hpoj ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307040812.h648CM6O062520>