head	1.5;
access;
symbols
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.4
	RELEASE_7_0_0:1.4
	RELEASE_6_3_0:1.4
	PRE_XORG_7:1.4
	RELEASE_4_EOL:1.4
	RELEASE_6_2_0:1.4
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.1;
locks; strict;
comment	@# @;


1.5
date	2010.07.02.11.47.26;	author johans;	state dead;
branches;
next	1.4;

1.4
date	2006.09.12.16.06.24;	author glewis;	state Exp;
branches;
next	1.3;

1.3
date	2006.02.23.10.34.20;	author ade;	state Exp;
branches;
next	1.2;

1.2
date	2004.06.09.21.07.42;	author glewis;	state Exp;
branches;
next	1.1;

1.1
date	2004.03.05.02.26.10;	author glewis;	state Exp;
branches;
next	;


desc
@@


1.5
log
@- Update to rpm-4.8.1 (previous version was nearly 10yrs old)
- Grab maintainership

Feature safe:	yes
@
text
@$FreeBSD: ports/archivers/rpm4/files/patch-configure,v 1.4 2006/09/12 16:06:24 glewis Exp $

--- configure.orig	Thu Feb 14 02:03:27 2002
+++ configure	Tue Sep 12 10:54:53 2006
@@@@ -186,6 +186,8 @@@@
 ac_help="$ac_help
   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
 ac_help="$ac_help
+  --with-popt-prefix=DIR  search for popt in DIR/include and DIR/lib"
+ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
@@@@ -7381,6 +7383,8 @@@@
 #  AC_DEFINE(HAVE_GZSEEK)
 #fi
 
+WITH_POPT_INCLUDE=$ac_default_prefix/include
+WITH_POPT_LIB=-L$ac_default_prefix/lib -lpopt
 
 
 
@@@@ -8335,6 +8339,47 @@@@
   DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb"
 else
   echo "$ac_t""no" 1>&6
+echo $ac_n "checking for db_create in -ldb3""... $ac_c" 1>&6
+echo "configure:8188: checking for db_create in -ldb3" >&5
+ac_lib_var=`echo db3'_'db_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldb3 $libthread $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8196 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char db_create();
+
+int main() {
+db_create()
+; return 0; }
+EOF
+if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb3"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 fi
 
       
@@@@ -8659,6 +8704,100 @@@@
 
 fi
 
+# Check whether --with-popt-prefix or --without-popt-prefix was given.
+if test "${with_popt_prefix+set}" = set; then
+  withval="$with_popt_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then
+        CPPFLAGS="$CPPFLAGS -I$dir/include";
+        WITH_POPT_INCLUDE="-I$dir/include";
+      fi
+      if test -d $dir/lib; then
+        LDFLAGS="$LDFLAGS -L$dir/lib";
+        WITH_POPT_LIB="-L$dir/lib -lpopt";
+      fi
+    done
+fi
+
+echo $ac_n "checking for popt.h""... $ac_c" 1>&6
+echo "configure:8724: checking for popt.h" >&5
+ac_lib_var=`echo popt'_'h | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="${WITH_POPT_INCLUDE}  $CPPFLAGS"
+cat > conftest.$ac_ext <<EOF
+#line 8494 "configure"
+#include "confdefs.h"
+#include <popt.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+
+int main() {
+return 0; }
+EOF
+if { (eval echo configure:8505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+CPPFLAGS="$ac_save_CPPFLAGS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  echo "configure: error: sorry rpm requires popt.h" 1>&2; exit 1;
+fi
+
+echo $ac_n "checking for poptGetOptArg in -lpopt""... $ac_c" 1>&6
+echo "configure:8724: checking for poptGetOptArg in -lpopt" >&5
+ac_lib_var=`echo popt'_'poptGetOptArg | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="${WITH_POPT_LIB}  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8494 "configure"
+#include "confdefs.h"
+#include <popt.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+
+int main() {
+const char *foo = poptGetNextOpt(NULL);
+return 0; }
+EOF
+if { (eval echo configure:8505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  echo "configure: error: sorry rpm requires libpopt" 1>&2; exit 1;
+fi
 
 
 for ac_func in personality
@@@@ -12512,6 +12651,68 @@@@
 WITH_PYTHON_VERSION=
 if test $withval = auto ; then
 
+  echo $ac_n "checking for python 2.4""... $ac_c" 1>&6
+echo "configure:12517: checking for python 2.4" >&5
+  if test "$cross_compiling" = yes; then
+  withval=yes
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12522 "configure"
+#include "confdefs.h"
+
+#include <python2.4/Python.h>
+main() {
+  exit(strncmp("2.4", PY_VERSION, 3));
+} 
+EOF
+if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  withval=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  withval=no
+fi
+rm -fr conftest*
+fi
+
+  echo "$ac_t""$withval" 1>&6
+  if test $withval = yes ; then
+    WITH_PYTHON_VERSION="2.4"
+  else
+
+  echo $ac_n "checking for python 2.3""... $ac_c" 1>&6
+echo "configure:12517: checking for python 2.3" >&5
+  if test "$cross_compiling" = yes; then
+  withval=yes
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12522 "configure"
+#include "confdefs.h"
+
+#include <python2.3/Python.h>
+main() {
+  exit(strncmp("2.3", PY_VERSION, 3));
+} 
+EOF
+if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  withval=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  withval=no
+fi
+rm -fr conftest*
+fi
+
+  echo "$ac_t""$withval" 1>&6
+  if test $withval = yes ; then
+    WITH_PYTHON_VERSION="2.3"
+  else
+
   echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
 echo "configure:12517: checking for python 2.2" >&5
   if test "$cross_compiling" = yes; then
@@@@ -12577,6 +12778,10 @@@@
 
 fi
 
+fi
+
+fi
+
 if test -n "$WITH_PYTHON_VERSION" ; then
   WITH_PYTHON_SUBDIR=python
   WITH_PYTHON_SUBPACKAGE=1
@@@@ -13130,21 +13335,7 @@@@
 
 echo "$ac_t""$ROOT_GROUP" 1>&6
 
-
-if test "x$varprefix" = "x"; then
-    # For /usr and /usr/local, we want the 'var' directory to go
-    # in /var and /var/local respectively. For everything else, 
-    # just put the 'var' directory in prefix/var.
-    case $prefix in
-	/usr | /usr/local )
-	    varprefix=`echo $prefix | sed 's/usr/var/'` ;;
-	NONE)
- 	    varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` ;;
-	*) 
-	    varprefix=$prefix/var ;;
-    esac	
-fi
-
+varprefix=/var
 
 if test "x$tmpdir" = "x"; then
     if test -d $varprefix/tmp; then
@@@@ -13349,7 +13540,7 @@@@
 
 
 
-subdirs="popt beecrypt zlib $WITH_DB_SUBDIR"
+subdirs="beecrypt $WITH_DB_SUBDIR"
 
 
 trap '' 1 2 15
@@@@ -13578,6 +13769,8 @@@@
 s%@@WITH_ZLIB_SUBDIR@@%$WITH_ZLIB_SUBDIR%g
 s%@@WITH_ZLIB_INCLUDE@@%$WITH_ZLIB_INCLUDE%g
 s%@@WITH_ZLIB_LIB@@%$WITH_ZLIB_LIB%g
+s%@@WITH_POPT_INCLUDE@@%$WITH_POPT_INCLUDE%g
+s%@@WITH_POPT_LIB@@%$WITH_POPT_LIB%g
 s%@@WITH_DB_SUBDIR@@%$WITH_DB_SUBDIR%g
 s%@@WITH_INTERNAL_DB@@%$WITH_INTERNAL_DB%g
 s%@@DBLIBSRCS@@%$DBLIBSRCS%g
@@@@ -13889,7 +14082,6 @@@@
           ;;
         esac
       done
-	echo timestamp > popt/stamp-h.in
 	echo timestamp > beecrypt/stamp-h.in
 	echo timestamp > stamp-h.in
   
@@@@ -13925,7 +14117,7 @@@@
     esac
   done
 
-  for ac_config_dir in popt beecrypt zlib $WITH_DB_SUBDIR; do
+  for ac_config_dir in beecrypt $WITH_DB_SUBDIR; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
@


1.4
log
@. Fix the build of the Python bindings for Python 2.4.  It seems like a
  better version of this patch would use bsd.python.mk and PYTHON_VERSION,
  but I don't have time right now.

PR:		103195
Submitted by:	Eygene A. Ryabinkin <rea-fbsd@@codelabs.ru>
@
text
@d1 1
a1 1
$FreeBSD$
@


1.3
log
@Conversion to a single libtool environment.

Approved by:	portmgr (kris)
@
text
@d1 4
a4 2
--- configure.orig	Wed Feb 13 16:03:27 2002
+++ configure	Thu Mar  4 12:55:48 2004
d172 1
a172 1
@@@@ -12512,6 +12651,37 @@@@
d176 31
d241 1
a241 1
@@@@ -12577,6 +12747,8 @@@@
d247 2
d252 1
a252 1
@@@@ -13130,21 +13302,7 @@@@
d275 1
a275 1
@@@@ -13349,7 +13507,7 @@@@
d284 1
a284 1
@@@@ -13578,6 +13736,8 @@@@
d293 1
a293 1
@@@@ -13889,7 +14049,6 @@@@
d301 1
a301 1
@@@@ -13925,7 +14084,7 @@@@
@


1.2
log
@. Use libtool 1.3.x rather than 1.4.x (thus removing the last port
  dependency on libtool14).

Submitted by:	ade
@
text
@a11 9
@@@@ -6138,7 +6140,7 @@@@
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL='%%LOCALBASE%%/bin/libtool13'
 
 # Prevent multiple expansion
 
@


1.1
log
@Add a port of rpm 4.0.4:

"The Red Hat Package Manager (RPM) is a powerful command line driven
 package management system capable of installing, uninstalling,
 verifying, querying, and updating computer software packages. Each
 software package consists of an archive of files along with information
 about the package like its version, a description, and the like.
 There is also a related API ("Application Program Interface"),
 permitting advanced developers to bypass 'shelling out' to a command
 line, and to manage such transactions from within a native coding
 language.

 WWW: http://www.rpm.org/"

4.0.4 was chosen because:
. The only newer version available as a tarball (4.1) is buggy.
. This version closely corresponds to our current default linux_base.
. This version uses the version of popt we have in the tree (unfortunately
  it uses an earlier version of beecrypt).
. This version is a lot less work to port than 4.2 (elfutils).

However, I am considering how best this port could be updated to a more
recent version (e.g. 4.1.1 or 4.2, probably the latter).

This wasn't an update to the current rpm port as I haven't done enough
testing of other ports that use rpm with it.

Tested on 4.9/i386, 5.2/sparc64 and 5.2/alpha.
@
text
@d17 1
a17 1
+LIBTOOL='%%LOCALBASE%%/bin/libtool14'
@

