Make this package build on Darwin.

  - Libtoolize.
  - Make "install" a phony target for case-insensitive file systems.

5 files changed, 38 insertions, 124 deletions

diff --git a/www/qDecoder/Makefile b/www/qDecoder/Makefile
index f4c06f5ef59..2059ca6bb24 100644
--- a/www/qDecoder/Makefile
+++ b/www/qDecoder/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/10 19:43:24 minskim Exp $
 
 DISTNAME=	qDecoder-7.0.1
 CATEGORIES=	www
+PKGREVISION=	1
 MASTER_SITES=	ftp://ftp.qDecoder.org/pub/qDecoder/
 EXTRACT_SUFX=	.tar.Z
 
@@ -10,6 +11,7 @@ HOMEPAGE=	http://www.qDecoder.org/
 COMMENT=	Web Application Interface for C/C++ (CGI Library)
 
 GNU_CONFIGURE=	YES
+USE_LIBTOOL=	YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qDecoder
diff --git a/www/qDecoder/PLIST b/www/qDecoder/PLIST
index 40ecb03eaea..169bbacf839 100644
--- a/www/qDecoder/PLIST
+++ b/www/qDecoder/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 00:53:51 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/06/10 19:43:24 minskim Exp $
 include/qDecoder.h
-lib/libqDecoder.a
-lib/libqDecoder.so
-lib/libqDecoder.so.0
-lib/libqDecoder.so.0.0
-lib/libqDecoder_pic.a
+lib/libqDecoder.la
 share/doc/qDecoder/AUTHORS
 share/doc/qDecoder/CHANGES
 share/doc/qDecoder/COPYING
diff --git a/www/qDecoder/distinfo b/www/qDecoder/distinfo
index be22f1c018c..77d266598fb 100644
--- a/www/qDecoder/distinfo
+++ b/www/qDecoder/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:38 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/06/10 19:43:24 minskim Exp $
 
 SHA1 (qDecoder-7.0.1.tar.Z) = a5c8f76e6a62405628f0b75a9e536b8ba4539f96
 RMD160 (qDecoder-7.0.1.tar.Z) = f8e4dfc7d531c749ee51eebbbfe864a66b05e3a2
 Size (qDecoder-7.0.1.tar.Z) = 993825 bytes
-SHA1 (patch-aa) = ff345b6eddc1851de1a4cafe2032232bf168ba72
+SHA1 (patch-aa) = 4824679d8d4d6b0efc5e2138d703fb56dcc8dcb3
+SHA1 (patch-ab) = 47b2c521b57ab6ae94119cca4337818e44f46c6f
diff --git a/www/qDecoder/patches/patch-aa b/www/qDecoder/patches/patch-aa
index a28ee4b62f1..2e8cac10e36 100644
--- a/www/qDecoder/patches/patch-aa
+++ b/www/qDecoder/patches/patch-aa
@@ -1,129 +1,34 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/04 00:53:51 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/10 19:43:24 minskim Exp $
 
---- src/Makefile.in.orig	Thu Sep  6 16:33:39 2001
-+++ src/Makefile.in	Thu Apr 25 09:06:29 2002
-@@ -37,87 +37,45 @@
- # Name
- PRGNAME		= qDecoder
+--- src/Makefile.in.orig	2001-09-06 08:33:39.000000000 -0700
++++ src/Makefile.in
+@@ -92,24 +92,17 @@ OBJ		= qDecoder.o \
  
--# Static Library Name
--LIBNAME		= lib${PRGNAME}.a
-+# Library Name
-+LIB		= ${PRGNAME}
- 
--# Shared Library Name
--SLIBVERSION	= 2
--SLIBNAME	= lib${PRGNAME}.so
--SLIBREALNAME	= ${SLIBNAME}.${SLIBVERSION}
-+# Shared Library Version
-+SHLIB_MAJOR	= 0
-+SHLIB_MINOR	= 0
- 
- # System library directory
- LIBDIR		= @libdir@
--HEADERDIR	= @includedir@
- 
--# Which compiler & options for release
--CC		= @CC@
--CFLAGS		= @CFLAGS@
--DEFS		= @DEFS@
--INCLUDE		= -I.
--
--# Utilities
--AR		= @AR@
--ARFLAGS		= -rc
--CHMOD		= @CHMOD@
--INSTALL		= @INSTALL@ -m 444
--LD		= @LD@
--LDFLAGS		= -G
--LN_S		= @LN_S@
--RANLIB		= @RANLIB@
--RM		= @RM@
--
--
--# Objects List
--OBJ		= qDecoder.o \
--		qSession.o \
--		qfDecoder.o \
--		qsDecoder.o \
--		qHttpHeader.o \
--		qError.o \
--		qEnv.o \
--		qEncode.o \
--		qString.o \
--		qFile.o \
--		qValid.o \
--		qArg.o \
--		qAwk.o \
--		qSed.o \
--		qCount.o \
--		qDownload.o \
--		qTime.o \
--		qMisc.o \
--		qInternalCommon.o \
--		qInternalEntry.o \
--		md5/md5c.o
--
--## Make Library
--all: ${OBJ}
+ ## Make Library
+ all: ${OBJ}
 -	${AR} ${ARFLAGS} ${LIBNAME} ${OBJ}
 -	${RANLIB} ${LIBNAME}
 -	${LD} ${LDFLAGS} -o ${SLIBREALNAME} ${OBJ}
 -	${CHMOD} 0644 ${SLIBREALNAME}
 -	${RM} -f ${SLIBNAME}
 -	${LN_S} ${SLIBREALNAME} ${SLIBNAME}
--
--## Compile Module
--.c.o:
++	${LIBTOOL} --mode=link ${CC} -o ${LIBNAME:.a=.la} ${OBJ:.o=.lo} \
++		-rpath ${PREFIX}/lib -version-info ${SLIBVERSION}:0:0
+ 
+ ## Compile Module
+ .c.o:
 -	${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
--
--## Install Module
++	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${DEFS} ${INCLUDE} -c -o $@ $<
+ 
+ ## Install Module
 -install: all
--	${INSTALL} qDecoder.h ${HEADERDIR}/qDecoder.h
++install:
+ 	${INSTALL} qDecoder.h ${HEADERDIR}/qDecoder.h
 -	${INSTALL} ${LIBNAME} ${LIBDIR}/${LIBNAME}
 -	${INSTALL} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME}
 -	${RM} -f ${LIBDIR}/${SLIBNAME}
 -	${LN_S} ${LIBDIR}/${SLIBREALNAME} ${LIBDIR}/${SLIBNAME}
--
--uninstall: deinstall
--deinstall:
--	${RM} -f ${HEADERDIR}/qDecoder.h
--	${RM} -f ${LIBDIR}/${LIBNAME}
--	${RM} -f ${LIBDIR}/${SLIBREALNAME}
--	${RM} -f ${LIBDIR}/${SLIBNAME}
--
--## Clear Module
--clean:
--	${RM} -f ${OBJ} ${LIBNAME} ${SLIBREALNAME} ${SLIBNAME}
-+CPPFLAGS	+= @DEFS@ -I.
-+
-+NOLINT		= 1
-+NOPROFILE	= 1
-+
-+# Sources List
-+SRCS		= qDecoder.c \
-+		qSession.c \
-+		qfDecoder.c \
-+		qsDecoder.c \
-+		qHttpHeader.c \
-+		qError.c \
-+		qEnv.c \
-+		qEncode.c \
-+		qString.c \
-+		qFile.c \
-+		qValid.c \
-+		qArg.c \
-+		qAwk.c \
-+		qSed.c \
-+		qCount.c \
-+		qDownload.c \
-+		qTime.c \
-+		qMisc.c \
-+		qInternalCommon.c \
-+		qInternalEntry.c \
-+		md5/md5c.c
-+
-+afterinstall:
-+	${BSD_INSTALL_DATA} qDecoder.h ${PREFIX}/include
-+
-+.include <bsd.lib.mk>
++	${LIBTOOL} --mode=install ${INSTALL} ${LIBNAME:.a=.la} ${LIBDIR}
+ 
+ uninstall: deinstall
+ deinstall:
diff --git a/www/qDecoder/patches/patch-ab b/www/qDecoder/patches/patch-ab
new file mode 100644
index 00000000000..048b6a27a61
--- /dev/null
+++ b/www/qDecoder/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1 2006/06/10 19:43:24 minskim Exp $
+
+--- Makefile.in.orig	2001-09-06 08:33:40.000000000 -0700
++++ Makefile.in
+@@ -61,3 +61,5 @@ distclean: clean
+ 		echo "===> Removing $${DIR}/Makefile"; \
+ 		(cd $${DIR}; rm -f Makefile); \
+ 	done
++
++.PHONY: install