Attachment #48279 for bug #73901

View | Details | Raw Unified | Return to bug 73901
Collapse All | Expand All

Lines 9-15 Link Here

(-)databases/libiodbc/Makefile (-11 / +28 lines)
9	# databases/unixODBC.	9	# databases/unixODBC.
10		10
11	PORTNAME= libiodbc	11	PORTNAME= libiodbc
12	PORTVERSION= 3.51.2	12	PORTVERSION= 3.52.1
13	CATEGORIES= databases	13	CATEGORIES= databases
14	MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \	14	MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \
15	${MASTER_SITE_SOURCEFORGE}	15	${MASTER_SITE_SOURCEFORGE}
Lines 20-48 Link Here
20		20
21	CONFLICTS= unixODBC-*	21	CONFLICTS= unixODBC-*
22		22
23	USE_INC_LIBTOOL_VER= 13	23	USE_GNOME= gnometarget
		24	USE_REINPLACE= yes
24	USE_GMAKE= yes	25	USE_GMAKE= yes
		26	GNU_CONFIGURE= yes
		27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		28	CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR}
25	INSTALLS_SHLIB= yes	29	INSTALLS_SHLIB= yes
		30
		31	MAN1= iodbc-config.1 iodbctest.1 iodbctestw.1
		32
		33	CPPFLAGS= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
		34	LDFLAGS= ${PTHREAD_LIBS}
26	INIDIR= ${PREFIX}/etc/${PORTNAME}	35	INIDIR= ${PREFIX}/etc/${PORTNAME}
27	CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
28	CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR} --with-pthread
29	CFLAGS += -D_BSD_WCHAR_T_DEFINED_
30		36
31	.if !defined(WITHOUT_GUI)	37	.if !defined(WITHOUT_GUI)
32	USE_GNOME= gtk12	38	USE_GNOME+= gtk12
		39	MAN1+= iodbccadm-gtk.1
33	PLIST_SUB+= GUI=""	40	PLIST_SUB+= GUI=""
34	.else	41	.else
35	CONFIGURE_ARGS+= --disable-gui	42	CONFIGURE_ARGS+= --disable-gui
36	PLIST_SUB+= GUI="@comment "	43	PLIST_SUB+= GUI="@comment "
37	.endif	44	.endif
38		45
		46	post-patch:
		47	@${REINPLACE_CMD} -e \
		48	's\|$$CFLAGS -pthread\|$$CFLAGS\|g' ${WRKSRC}/configure
		49	@${REINPLACE_CMD} -e \
		50	'/^SUBDIRS/s\|samples\|\|' ${WRKSRC}/Makefile.in
		51
39	post-install:	52	post-install:
40	@ ${MKDIR} ${INIDIR} && \	53	@${MKDIR} ${INIDIR}
41	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}	54	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
42	.if !defined(NOPORTDOCS)	55	.if !defined(NOPORTDOCS)
43	@ ${MKDIR} ${DOCSDIR}	56	@${MKDIR} ${DOCSDIR}
44	.for docfile in AUTHORS COPYING ChangeLog NEWS README	57	.for file in AUTHORS ChangeLog NEWS README
45	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}	58	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		59	.endfor
		60	@${MKDIR} ${EXAMPLESDIR}
		61	.for file in Makefile iodbctest.c
		62	${INSTALL_DATA} ${WRKSRC}/samples/${file} ${EXAMPLESDIR}
46	.endfor	63	.endfor
47	.endif	64	.endif
48		65

Lines 1-2 Link Here

(-)databases/libiodbc/distinfo (-2 / +2 lines)
1	MD5 (libiodbc-3.51.2.tar.gz) = bda106d1f0f4d2550d38a8f86540537f	1	MD5 (libiodbc-3.52.1.tar.gz) = e6c3cb680a198922589d06b3161aff30
2	SIZE (libiodbc-3.51.2.tar.gz) = 546518	2	SIZE (libiodbc-3.52.1.tar.gz) = 568834

Lines 1-10 Link Here

(-)databases/libiodbc/files/patch-include::sqltypes.h (-5 / +5 lines)
1	--- include/sqltypes.h.orig Fri Mar 26 08:33:24 2004	1	--- include/sqltypes.h.orig Wed Sep 29 19:14:06 2004
2	+++ include/sqltypes.h Fri Mar 26 08:33:37 2004	2	+++ include/sqltypes.h Sat Nov 13 15:26:42 2004
3	@@ -409,6 +409,7 @@	3	@@ -387,6 +387,7 @@
4	# if defined(_WCHAR_T) \|\| \	4	# if defined(_WCHAR_T) \|\| \
5	defined(_WCHAR_T_DEFINED) \|\| \	5	defined(_WCHAR_T_DEFINED) \|\| \
6	defined(_WCHAR_T_DECLARED) \|\| \	6	defined(_WCHAR_T_DECLARED) \|\| \
7	+ defined(__FreeBSD__) \|\| \	7	+ defined(__FreeBSD__) \|\| \
8	defined(_BSD_WCHAR_T_DEFINED_)	8	defined(_BSD_WCHAR_T_DEFINED_)
9	typedef wchar_t SQLWCHAR;	9	typedef wchar_t SQLWCHAR;
10	# else	10	# else

Lines 1-15 Link Here

(-)databases/libiodbc/pkg-plist (-7 / +11 lines)
1	%%PORTDOCS%%share/doc/libiodbc/AUTHORS
2	%%PORTDOCS%%share/doc/libiodbc/COPYING
3	%%PORTDOCS%%share/doc/libiodbc/ChangeLog
4	%%PORTDOCS%%share/doc/libiodbc/NEWS
5	%%PORTDOCS%%share/doc/libiodbc/README
6	bin/iodbc-config	1	bin/iodbc-config
7	bin/iodbctest
8	%%GUI%%bin/iodbcadm-gtk	2	%%GUI%%bin/iodbcadm-gtk
		3	%%GUI%%bin/iodbctest
		4	%%GUI%%bin/iodbctestw
9	etc/libiodbc/odbc.ini.sample	5	etc/libiodbc/odbc.ini.sample
10	etc/libiodbc/odbcinst.ini.sample	6	etc/libiodbc/odbcinst.ini.sample
11	include/iodbcext.h	7	include/iodbcext.h
12	include/iodbcinst.h	8	include/iodbcinst.h
		9	include/iodbcunix.h
13	include/isql.h	10	include/isql.h
14	include/isqlext.h	11	include/isqlext.h
15	include/isqltypes.h	12	include/isqltypes.h
Lines 35-39 Link Here
35	lib/libiodbcinst.so.3	32	lib/libiodbcinst.so.3
36	lib/libodbc.a	33	lib/libodbc.a
37	lib/libodbc.so	34	lib/libodbc.so
38	%%PORTDOCS%%@dirrm share/doc/libiodbc	35	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
		36	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
		37	%%PORTDOCS%%%%DOCSDIR%%/NEWS
		38	%%PORTDOCS%%%%DOCSDIR%%/README
		39	%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
		40	%%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c
		41	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
		42	%%PORTDOCS%%@dirrm %%DOCSDIR%%
39	@dirrm etc/libiodbc	43	@dirrm etc/libiodbc

Return to bug 73901