Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Oct 2006 20:27:45 -0600
From:      "Frank J. Laszlo" <laszlof@vonostingroup.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/104367: [PATCH]: lang/pike70: fix pkg-plist
Message-ID:  <E1GYCm1-000PhD-5L@main.vonostingroup.com>
Resent-Message-ID: <200610130230.k9D2UG6P067287@freefall.freebsd.org>

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

>Number:         104367
>Category:       ports
>Synopsis:       [PATCH]: lang/pike70: fix pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 13 02:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Frank J. Laszlo
>Release:        FreeBSD 5.4-RELEASE-p18 i386
>Organization:
>Environment:
System: FreeBSD main.vonostingroup.com 5.4-RELEASE-p18 FreeBSD 5.4-RELEASE-p18 #1: Sat Sep 16 18:56:42 UTC 2006 laszlof@main.vonostingroup.com:/usr/obj/usr/src/sys/MAIN i386


	
>Description:
	This patch will fix missing files in pkg-plist. It will also remove 
	scripts/configure.pike and utilize the more current OPTIONS framework.
	Maintainer has been CC'd.

>How-To-Repeat:
	
>Fix:



--- pike-7.0.361.diff begins here ---
diff -NrU3 pike70.orig/Makefile pike70/Makefile
--- pike70.orig/Makefile	Thu Oct 12 17:23:22 2006
+++ pike70/Makefile	Thu Oct 12 20:15:27 2006
@@ -20,41 +20,91 @@
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison/
 
-BROKEN=		Incorrect pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+
+GNU_CONFIGURE=	yes
+MAN1=		hilfe.1 pike.1
 
-IS_INTERACTIVE=	yes
-GNU_CONFIGURE=  yes
+OPTIONS+=		FREETYPE        "TrueType font rendering" off
+OPTIONS+=		JPEG            "support JPEG" off
+OPTIONS+=		THREADS         "threads support" on
+OPTIONS+=		GDBM            "GNU database manager support" off
+OPTIONS+=		ZLIB            "zlib library support" on
+OPTIONS+=		GMP             "support bignums" on
+OPTIONS+=		READLINE        "support for command line editing" on
+OPTIONS+=		MYSQL           "MySQL database support" off
+OPTIONS+=		POSTGRESQL      "PostgreSQL database support" off
+OPTIONS+=		MSQL            "mSQL database support" off
+OPTIONS+=		SSL             "SSL support" off
 
 .include <bsd.port.pre.mk>
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.if !defined(WITHOUT_FREETYPE)
+LIB_DEPENDS+=		ttf.4:${PORTSDIR}/print/freetype
+CONFIGURE_ARGS+=	--with-ttflib
 .else
-CONFIGURE_ARGS?= \
-	--without-ttflib \
-	--without-gdbm \
-	--without-mysql \
-	--without-postgresql \
-	--without-msql \
-	--without-jpeg
+CONFIGURE_ARGS+=	--without-ttflib
 .endif
-CONFIGURE_ARGS+= --without-debug --with-poll --with-oob --with-max-fds=10000 --without-GTK
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-pre-fetch:
-.if !defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.pike
+.if !defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--with-threads
+.else
+CONFIGURE_ARGS+=	--without-threads
+.endif
+.if !defined(WITHOUT_GMP)
+LIB_DEPENDS+=		gmp.7:${PORTSDIR}/math/libgmp4
+CONFIGURE_ARGS+=	--with-gmp --with-bignums
+.else
+CONFIGURE_ARGS+=	--without-gmp --without-bignums
+.endif
+.if !defined(WITHOUT_READLINE)
+CONFIGURE_ARGS+=	--with-readline
+.else
+CONFIGURE_ARGS+=	--without-readline
+.endif
+.if !defined(WITHOUT_JPEG)
+LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
+CONFIGURE_ARGS+=	--with-jpeg=${PREFIX}
+.else
+CONFIGURE_ARGS+=	--without-jpeg
+.endif
+.if !defined(WITHOUT_GDBM)
+LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
+CONFIGURE_ARGS+=	--with-gdbm=${PREFIX}
+.else
+CONFIGURE_ARGS+=	--without-gdbm
+.endif
+.if !defined(WITHOUT_ZLIB)
+CONFIGURE_ARGS+=	--with-zlib
+.else
+CONFIGURE_ARGS+=	--without-zlib
+.endif
+.if !defined(WITHOUT_MYSQL)
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+.if !defined(WITHOUT_POSTGRESQL)
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}/pgsql
+.else
+CONFIGURE_ARGS+=	--without-pgsql
+.endif
+.if !defined(WITHOUT_MSQL)
+BUILD_DEPENDS+=		msql:${PORTSDIR}/databases/msql
+CONFIGURE_ARGS+=	--with-msql=${PREFIX}
+.else
+CONFIGURE_ARGS+=	--without-msql
+.endif
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--with-ssleay
+.else
+CONFIGURE_ARGS+=	--without-ssleay
 .endif
 
-pre-configure:
-	@${ECHO} ${CONFIGURE_ARGS}
-
-pre-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+CONFIGURE_ARGS+=	--without-debug --with-poll --with-oob --with-max-fds=10000 --without-GTK
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}pike ${PREFIX}/bin
diff -NrU3 pike70.orig/files/patch-bin-install.pike pike70/files/patch-bin-install.pike
--- pike70.orig/files/patch-bin-install.pike	Wed Dec 31 17:00:00 1969
+++ pike70/files/patch-bin-install.pike	Thu Oct 12 19:55:02 2006
@@ -0,0 +1,16 @@
+--- bin/install.pike.orig	Mon Sep 24 17:52:22 2001
++++ bin/install.pike	Thu Oct 12 19:53:38 2006
+@@ -986,12 +986,12 @@
+ 	lnk=combine_path(vars->exec_prefix || combine_path(vars->prefix, "bin"),"pike");
+ 	old_exec_prefix=vars->exec_prefix; // to make the directory for pike link
+       }
++      man_prefix=combine_path(prefix,"man");
+       prefix=combine_path("/",getcwd(),prefix,"pike",
+ 			  replace(version()-"Pike v"," release ","."));
+       exec_prefix=combine_path(prefix,"bin");
+       lib_prefix=combine_path(prefix,"lib");
+       include_prefix=combine_path(prefix,"include","pike");
+-      man_prefix=combine_path(prefix,"man");
+       break;
+   }
+   break;
diff -NrU3 pike70.orig/pkg-plist pike70/pkg-plist
--- pike70.orig/pkg-plist	Thu Oct 12 17:23:22 2006
+++ pike70/pkg-plist	Thu Oct 12 20:21:48 2006
@@ -267,7 +267,6 @@
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/mysql_result.pike
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/msql.pike
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/mysql.pike
-pike/%%PORTVERSION%%/lib/modules/Sql.pmod/mysql.pike.o
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/odbc.pike
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/postgres_result.pike
 pike/%%PORTVERSION%%/lib/modules/Sql.pmod/odbc_result.pike
@@ -433,8 +432,6 @@
 pike/%%PORTVERSION%%/include/pike/treeopt.h
 pike/%%PORTVERSION%%/include/pike/case_info.h
 pike/%%PORTVERSION%%/include/pike/aclocal.m4
-pike/%%PORTVERSION%%/man/man1/hilfe.1
-pike/%%PORTVERSION%%/man/man1/pike.1
 @dirrm pike/%%PORTVERSION%%/bin
 @dirrm pike/%%PORTVERSION%%/lib/modules/ADT.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/Crypto
@@ -471,7 +468,5 @@
 @dirrm pike/%%PORTVERSION%%/lib
 @dirrm pike/%%PORTVERSION%%/include/pike
 @dirrm pike/%%PORTVERSION%%/include
-@dirrm pike/%%PORTVERSION%%/man/man1
-@dirrm pike/%%PORTVERSION%%/man
 @dirrm pike/%%PORTVERSION%%
 @dirrm pike
diff -NrU3 pike70.orig/scripts/configure.pike pike70/scripts/configure.pike
--- pike70.orig/scripts/configure.pike	Thu Oct 12 17:23:22 2006
+++ pike70/scripts/configure.pike	Wed Dec 31 17:00:00 1969
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-/usr/bin/dialog --title "Pike configuration options" --clear \
-	--checklist "\n\
-Please select desired options:" -1 -1 11 \
-FreeType	"TrueType font rendering" OFF \
-JPEG		"support JPEG" OFF \
-threads		"threads support" ON \
-GDBM		"GNU database manager support" OFF \
-zlib		"zlib library support" ON \
-gmp		"support bignums" ON \
-readline	"support for command line editing" ON \
-MySQL		"MySQL database support" OFF \
-PostgreSQL	"PostgreSQL database support" OFF \
-mSQL		"mSQL database support" OFF \
-ssl	        "SSL support" OFF \
-2> /tmp/checklist.tmp.$$
-retval=$?
-
-if [ -s /tmp/checklist.tmp.$$ ]; then
-	set `cat /tmp/checklist.tmp.$$`
-fi
-rm -f /tmp/checklist.tmp.$$
-
-case $retval in
-	0)	if [ -z "$*" ]; then
-			echo "Nothing selected"
-		fi
-		;;
-	1)	echo "Cancel pressed."
-		exit 1
-		;;
-esac
-
-mkdir -p ${WRKDIRPREFIX}${CURDIR}
-> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		\"FreeType\")
-			echo 'LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-ttflib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			FreeType=1
-			;;
-		\"threads\")
-			threads=1
-			;;
-		\"gmp\")
-			echo '.if ${OSVERSION} >= 500000' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo '.endif' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-gmp' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			gmp=1
-			;;
-		\"readline\")
-			echo 'CONFIGURE_ARGS+=	--with-readline' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			readline=1
-			;;
-		\"JPEG\")
-			echo 'LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-jpeg=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			JPEG=1
-			;;
-		\"GDBM\")
-			echo 'LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc 
-			echo 'CONFIGURE_ARGS+=	--with-gdbm=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			GDBM=1
-			;;
-		\"zlib\")
-			echo 'CONFIGURE_ARGS+=	--with-zlib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			zlib=1
-			;;
-		\"MySQL\")
-			echo 'LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-mysql=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			MySQL=1
-			;;
-		\"PostgreSQL\")
-			echo 'USE_PGSQL=		yes' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}/pgsql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			PostgresSQL=1
-			;;
-		\"mSQL\")
-			echo 'BUILD_DEPENDS+=		msql:${PORTSDIR}/databases/msql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo 'CONFIGURE_ARGS+=	--with-msql=${PREFIX}' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			mSQL=1
-			;;
-		\"ssl\")
-			echo 'CONFIGURE_ARGS+= --with-ssleay' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			ssl=1
-			;;
-	esac
-	shift
-done
-if [ -z "$FreeType" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-ttflib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$threads" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-threads' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$GDBM" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-gdbm' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$zlib" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-zlib' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$MySQL" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-mysql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$PostgreSQL" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-postgresql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$mSQL" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-msql' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$gmp" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-gmp --without-bignums' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$JPEG" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-jpeg' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-if [ -z "$readline" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-readline' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-if [ -z "$ssl" ]; then
-	echo 'CONFIGURE_ARGS+=  --without-ssl' >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc  
-fi
-fi
--- pike-7.0.361.diff ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GYCm1-000PhD-5L>