Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Sep 2000 19:22:41 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21283: Update port: misc/qhacc to 0.6
Message-ID:  <20000915022241.1653B37B422@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         21283
>Category:       ports
>Synopsis:       Update port: misc/qhacc to 0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 14 19:30:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.6

New file:
patches/patch-ab
pkg/MESSAGE

Remove file:
files/qhacc.sh

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/misc/qhacc/Makefile misc/qhacc/Makefile
--- /usr/ports/misc/qhacc/Makefile	Thu Jun 22 19:15:26 2000
+++ misc/qhacc/Makefile	Wed Sep 13 22:54:55 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
 
@@ -15,18 +15,19 @@
 USE_QT2=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt="${X11BASE}"
-MAKE_ENV+=	QTDIR=${PREFIX} CXX="${CXX}" CC="${CC}"
+CONFIGURE_ARGS=	--with-qt="${X11BASE}"
 
 pre-build:
 	@${RM} -f ${WRKSRC}/src/moc_*.cpp
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin/qhacc.exec
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/qhacc.sh \
-		> ${PREFIX}/bin/qhacc
-	@${CHMOD} 755 ${PREFIX}/bin/qhacc
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/qhacc
-	@${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
+	${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/qhacc
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/qhacc
+.endif
+	@${SED} -e "s:/usr/X11R6:${PREFIX}:g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/misc/qhacc/files/md5 misc/qhacc/files/md5
--- /usr/ports/misc/qhacc/files/md5	Mon Apr 24 19:01:04 2000
+++ misc/qhacc/files/md5	Wed Sep 13 20:42:39 2000
@@ -1 +1 @@
-MD5 (qhacc-0.5.tar.gz) = d8ece4da9d86a6cdd8444aaeed8987f4
+MD5 (qhacc-0.6.tar.gz) = 60596f6b31629b3be802cecd044393ac
diff -urN /usr/ports/misc/qhacc/files/qhacc.sh misc/qhacc/files/qhacc.sh
--- /usr/ports/misc/qhacc/files/qhacc.sh	Sun Feb 13 13:09:40 2000
+++ misc/qhacc/files/qhacc.sh	Thu Jan  1 09:00:00 1970
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ ! -d "${HOME}/.qhacc" ]; then
-	echo "No ${HOME}/.qhacc/ directory, creating.."
-	/bin/mkdir -p ${HOME}/.qhacc
-	/bin/cp %%PREFIX%%/share/qhacc/config.sample ${HOME}/.qhacc/config
-fi
-QHACC_HOME="${HOME}/.qhacc" %%PREFIX%%/bin/qhacc.exec
diff -urN /usr/ports/misc/qhacc/patches/patch-aa misc/qhacc/patches/patch-aa
--- /usr/ports/misc/qhacc/patches/patch-aa	Mon Apr 24 19:01:04 2000
+++ misc/qhacc/patches/patch-aa	Wed Sep 13 23:04:58 2000
@@ -1,6 +1,6 @@
---- src/Makefile.in	Wed Apr 12 15:42:26 2000
-+++ src/Makefile.in.new	Sat Apr 22 00:41:55 2000
-@@ -94,10 +94,10 @@
+--- src/Makefile.in.orig	Sun Aug 27 10:24:42 2000
++++ src/Makefile.in	Wed Sep 13 20:44:43 2000
+@@ -94,12 +94,12 @@
  		qhaccgrapher.h
  
  
@@ -12,5 +12,8 @@
 +qhacc_LDADD = -lqt2
 +MOC = $(QTDIR)/bin/moc2
  
- CXXFLAGS = -O2 -Wall $(MYFLAGS)
+-CXXFLAGS = -O2 -Wall $(MYFLAGS)
++CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff -urN /usr/ports/misc/qhacc/patches/patch-ab misc/qhacc/patches/patch-ab
--- /usr/ports/misc/qhacc/patches/patch-ab	Thu Jan  1 09:00:00 1970
+++ misc/qhacc/patches/patch-ab	Wed Sep 13 22:33:50 2000
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Aug 21 05:14:11 2000
++++ configure	Wed Sep 13 20:51:38 2000
+@@ -1255,7 +1255,7 @@
+ 
+ 	for dir in $with_qt
+ 	do
+-		if test -f $dir/lib/libqt.so.2
++		if test -f $dir/lib/libqt2.so
+ 		then
+ 			qthome=$dir
+ 			echo "found in $dir"
diff -urN /usr/ports/misc/qhacc/pkg/MESSAGE misc/qhacc/pkg/MESSAGE
--- /usr/ports/misc/qhacc/pkg/MESSAGE	Thu Jan  1 09:00:00 1970
+++ misc/qhacc/pkg/MESSAGE	Wed Sep 13 22:55:17 2000
@@ -0,0 +1,10 @@
+************************************************************
+ Before running QHacc, users should prepare as follows:
+
+  $ mkdir ~/.qhacc
+  $ cp /usr/X11R6/share/qhacc/config.sample ~/.qhacc/config
+  $ chmod u+rw ~/.qhacc/config
+  $ export QHACC_HOME=~/.qhacc (sh or bash)
+  $ setenv QHACC_HOME ~/.qhacc (csh or tcsh)
+
+************************************************************
diff -urN /usr/ports/misc/qhacc/pkg/PLIST misc/qhacc/pkg/PLIST
--- /usr/ports/misc/qhacc/pkg/PLIST	Sun Feb 13 13:09:42 2000
+++ misc/qhacc/pkg/PLIST	Wed Sep 13 22:11:06 2000
@@ -1,4 +1,9 @@
 bin/qhacc
-bin/qhacc.exec
+share/doc/qhacc/index.html
+share/doc/qhacc/intro.html
+share/doc/qhacc/formats.html
+share/doc/qhacc/using.html
+share/doc/qhacc/primer.html
 share/qhacc/config.sample
 @dirrm share/qhacc
+@dirrm share/doc/qhacc


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000915022241.1653B37B422>