Date: Sat, 20 Dec 2003 23:08:43 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60441: [maintainer] graphics/hpoj: Fix build on -CURRENT/alpha Message-ID: <200312202208.hBKM8gsA015064@varphi.theater.foldr.org> Resent-Message-ID: <200312202210.hBKMAFED075926@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60441 >Category: ports >Synopsis: [maintainer] graphics/hpoj: Fix build on -CURRENT/alpha >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 20 14:10:15 PST 2003 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 5.1-20031207-SNAP alpha >Organization: >Environment: System: FreeBSD varphi.theater.foldr.org 5.1-20031207-SNAP FreeBSD 5.1-20031207-SNAP #0: Sat Dec 20 06:47:42 CET 2003 root@varphi.theater.foldr.org:/usr/src/sys/alpha/compile/VARPHI alpha >Description: - Don't create /etc/ld.so.conf - Sanitize post-install-message - Fix libcipher-detection (not present past 5.0) - Unbreak alpha-patches >How-To-Repeat: >Fix: Removed file: extra-patch-mlcd-ParPort.cpp Added file: patch-Makefile.in --- hpoj.patch begins here --- diff -urN /usr/ports/graphics/hpoj/Makefile hpoj/Makefile --- /usr/ports/graphics/hpoj/Makefile Wed Dec 17 09:56:59 2003 +++ hpoj/Makefile Sat Dec 20 22:52:58 2003 @@ -55,14 +55,17 @@ .if ${ARCH} == "alpha" EXTRA_PATCHES= ${FILESDIR}/extra-patch-mlcd-Makefile.in \ - ${FILESDIR}/extra-patch-mlcd-ParPort.cpp \ ${FILESDIR}/extra-patch-mlcd-ParPort.h .endif GNU_CONFIGURE= yes # Necessary hacks to find libsnmp: +.if ${OSVERSION} < 510000 +EXTRALDFLAGS= -lcipher +.endif CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -lcipher -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${EXTRALDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ARGS+= --with-snmp=${LOCALBASE}/include/ucd-snmp .ifdef(WITHOUT_X11) CONFIGURE_ARGS+= --without-qt diff -urN /usr/ports/graphics/hpoj/files/extra-patch-mlcd-Makefile.in hpoj/files/extra-patch-mlcd-Makefile.in --- /usr/ports/graphics/hpoj/files/extra-patch-mlcd-Makefile.in Sat May 24 08:04:08 2003 +++ hpoj/files/extra-patch-mlcd-Makefile.in Sat Dec 20 19:36:27 2003 @@ -1,11 +1,11 @@ ---- mlcd/Makefile.in.orig Sat May 24 08:03:14 2003 -+++ mlcd/Makefile.in Sat May 24 08:03:37 2003 -@@ -35,7 +35,7 @@ - for link in $(LINKS) ; do ln -s . $$link ; done +--- mlcd/Makefile.in.orig Sat Dec 20 19:36:00 2003 ++++ mlcd/Makefile.in Sat Dec 20 19:36:10 2003 +@@ -31,7 +31,7 @@ + all: $(GOAL) $(GOAL): $(OBJS) -- $(CXX) -o $(GOAL) $(OBJS) -+ $(CXX) -o $(GOAL) -lio $(OBJS) +- $(CXX) $(LFLAGS) -o $(GOAL) $(OBJS) ++ $(CXX) $(LFLAGS) -lio -o $(GOAL) $(OBJS) clean: - rm -f $(OBJS) $(GOAL) $(LINKS) + rm -f $(OBJS) $(GOAL) diff -urN /usr/ports/graphics/hpoj/files/extra-patch-mlcd-ParPort.cpp hpoj/files/extra-patch-mlcd-ParPort.cpp --- /usr/ports/graphics/hpoj/files/extra-patch-mlcd-ParPort.cpp Sat May 24 08:04:30 2003 +++ hpoj/files/extra-patch-mlcd-ParPort.cpp Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- mlcd/ParPort.cpp.orig Sat May 24 08:03:20 2003 -+++ mlcd/ParPort.cpp Sat May 24 08:03:48 2003 -@@ -926,9 +926,6 @@ - #elif defined(PAR_PLATFORM_FREEBSD) - #include <unistd.h> - #include <fcntl.h> -- extern "C" { -- #include <machine/cpufunc.h> -- } - #else - /* TODO: Handle these more gracefully! */ - #error Undefined platform diff -urN /usr/ports/graphics/hpoj/files/patch-Makefile.in hpoj/files/patch-Makefile.in --- /usr/ports/graphics/hpoj/files/patch-Makefile.in Tue May 20 09:41:02 2003 +++ hpoj/files/patch-Makefile.in Sat Dec 20 21:22:05 2003 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 26 14:05:04 2002 -+++ Makefile.in Mon May 19 12:12:29 2003 +--- Makefile.in.orig Tue Sep 23 03:16:41 2003 ++++ Makefile.in Sat Dec 20 21:21:36 2003 @@ -5,6 +5,9 @@ SUBDIRS=@SUBDIRS@ DISTCLEANS=Makefile config.cache config.log config.status scripts/ptal-init @@ -31,3 +31,27 @@ fi ; \ done ; \ cd .. ; \ +@@ -164,11 +167,6 @@ + fi ; \ + fi ; \ + echo ; \ +- if ! grep $(libdir) /etc/ld.so.conf >/dev/null 2>/dev/null ; then \ +- echo "Adding $(libdir) to /etc/ld.so.conf." ; \ +- echo $(libdir) >>/etc/ld.so.conf ; \ +- fi ; \ +- ldconfig ; \ + else \ + if ! test -d /etc/profile.d || ! test -f /etc/profile.d/hpoj.sh || ! test -f /etc/profile.d/hpoj.csh ; then \ + echo "You may need to add $(bindir) and $(sbindir) to your PATH." ; \ +@@ -193,11 +191,6 @@ + fi ; \ + fi + @ echo +- @ for file in /bin/bash /usr/bin/perl ; do \ +- if ! test -x $$file ; then \ +- echo "As root, please install and/or create a symlink to \"$$file\"." ; \ +- fi ; \ +- done + @ echo + @ for file in bin/hpo bin/ieee12844_print bin/ptal-printd bin/addpjl lib/ieee12844.o lib/ieee12844pp.o etc/ptal-start.conf etc/ptal-start.conf.new etc/ptal-stop.conf etc/ptal-stop.conf.new share/pixmaps/hpoj doc/hpoj ; do \ + if test -f $(prefix)/$$file ; then \ --- hpoj.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312202208.hBKM8gsA015064>