Attachment #144437 for bug #191579




# $FreeBSD: head/lang/urweb/Makefile 360217 2014-07-02 16:21:52Z danilo $

PORTNAME=	urweb
PORTVERSION=	20140704
PORTREVISION=	2
CATEGORIES=	lang www
MASTER_SITES=	http://www.impredicative.com/ur/
EXTRACT_SUFX=	.tgz

CFLAGS+=	-pthread

OPTIONS_DEFINE=	ELISP PGSQL SQLITE MYSQL
OPTIONS_DEFAULT=	ELISP PGSQL
OPTIONS_EXCLUDE=	NLS DOCS
ELISP_DESC=	Install contributed Emacs Lisp

.include <bsd.port.options.mk>

USE_OPENSSL=	yes
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}

.if ${PORT_OPTIONS:MELISP}
PLIST_SUB+=	ELISP=""
CONFIGURE_ARGS+=	with_emacs=yes

CONFIGURE_ENV+=	MSHEADER="no"
.endif

post-patch:
	${REINPLACE_CMD} -e "s|postgresql/libpq-fe.h|libpq-fe.h|g" \
	${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)urweb/distinfo (-2 / +2 lines)
1	SHA256 (urweb-20120925.tgz) = d617edc89a16ab675a8ce13bd25aa19b71837d239b30987da447c126da0be663	1	SHA256 (urweb-20140704.tgz) = 77ae6b607c2a0fb83cd5f9f2752834d33dda89ca01f76bedb664b55adcd6392b
2	SIZE (urweb-20120925.tgz) = 826968	2	SIZE (urweb-20140704.tgz) = 4256612




--- configure.orig	2012-09-25 05:16:58.000000000 -0700
+++ configure	2013-02-16 19:55:33.000000000 -0800
@@ -11744,14 +11744,14 @@
 
 
 if test -z $PGHEADER; then
-   for ac_header in postgresql/libpq-fe.h
+   for ac_header in libpq-fe.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "postgresql/libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default"
+  ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default"
 if test "x$ac_cv_header_postgresql_libpq_fe_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_POSTGRESQL_LIBPQ_FE_H 1
 _ACEOF
- PGHEADER=postgresql/libpq-fe.h
+ PGHEADER=libpq-fe.h
 fi
 
 done

Lines 3-9 Link Here

(-)urweb/pkg-plist (+4 lines)
3	include/urweb/queue.h	3	include/urweb/queue.h
4	include/urweb/request.h	4	include/urweb/request.h
5	include/urweb/types.h	5	include/urweb/types.h
		6	include/urweb/types_cpp.h
6	include/urweb/urweb.h	7	include/urweb/urweb.h
		8	include/urweb/urweb_cpp.h
7	lib/liburweb.a	9	lib/liburweb.a
8	lib/liburweb.so	10	lib/liburweb.so
9	lib/liburweb.so.0	11	lib/liburweb.so.0
Lines 28-33 Link Here
28	lib/urweb/ur/basis.urs	30	lib/urweb/ur/basis.urs
29	lib/urweb/ur/char.ur	31	lib/urweb/ur/char.ur
30	lib/urweb/ur/char.urs	32	lib/urweb/ur/char.urs
		33	lib/urweb/ur/datetime.ur
		34	lib/urweb/ur/datetime.urs
31	lib/urweb/ur/list.ur	35	lib/urweb/ur/list.ur
32	lib/urweb/ur/list.urs	36	lib/urweb/ur/list.urs
33	lib/urweb/ur/listPair.ur	37	lib/urweb/ur/listPair.ur

Return to bug 191579

Lines 2-9 Link Here

(-)urweb/Makefile (-4 / +10 lines)
2	# $FreeBSD: head/lang/urweb/Makefile 360217 2014-07-02 16:21:52Z danilo $	2	# $FreeBSD: head/lang/urweb/Makefile 360217 2014-07-02 16:21:52Z danilo $
3		3
4	PORTNAME= urweb	4	PORTNAME= urweb
5	PORTVERSION= 20120925	5	PORTVERSION= 20140704
6	PORTREVISION= 2
7	CATEGORIES= lang www	6	CATEGORIES= lang www
8	MASTER_SITES= http://www.impredicative.com/ur/	7	MASTER_SITES= http://www.impredicative.com/ur/
9	EXTRACT_SUFX= .tgz	8	EXTRACT_SUFX= .tgz
Lines 26-37 Link Here
26	CFLAGS+= -pthread	25	CFLAGS+= -pthread
27		26
28	OPTIONS_DEFINE= ELISP PGSQL SQLITE MYSQL	27	OPTIONS_DEFINE= ELISP PGSQL SQLITE MYSQL
29	OPTIONS_DEFAULT=ELISP PGSQL	28	OPTIONS_DEFAULT= ELISP PGSQL
30	OPTIONS_EXCLUDE=NLS DOCS	29	OPTIONS_EXCLUDE= NLS DOCS
31	ELISP_DESC= Install contributed Emacs Lisp	30	ELISP_DESC= Install contributed Emacs Lisp
32		31
33	.include <bsd.port.options.mk>	32	.include <bsd.port.options.mk>
34		33
		34	USE_OPENSSL= yes
		35	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
		36
35	.if ${PORT_OPTIONS:MELISP}	37	.if ${PORT_OPTIONS:MELISP}
36	PLIST_SUB+= ELISP=""	38	PLIST_SUB+= ELISP=""
37	CONFIGURE_ARGS+= with_emacs=yes	39	CONFIGURE_ARGS+= with_emacs=yes
Lines 58-61 Link Here
58	CONFIGURE_ENV+= MSHEADER="no"	60	CONFIGURE_ENV+= MSHEADER="no"
59	.endif	61	.endif
60		62
		63	post-patch:
		64	${REINPLACE_CMD} -e "s\|postgresql/libpq-fe.h\|libpq-fe.h\|g" \
		65	${WRKSRC}/configure
		66
61	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)urweb/files/patch-configure (-20 lines)
1	--- configure.orig 2012-09-25 05:16:58.000000000 -0700
2	+++ configure 2013-02-16 19:55:33.000000000 -0800
3	@@ -11744,14 +11744,14 @@
4
5
6	if test -z $PGHEADER; then
7	- for ac_header in postgresql/libpq-fe.h
8	+ for ac_header in libpq-fe.h
9	do :
10	- ac_fn_c_check_header_mongrel "$LINENO" "postgresql/libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default"
11	+ ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_postgresql_libpq_fe_h" "$ac_includes_default"
12	if test "x$ac_cv_header_postgresql_libpq_fe_h" = x""yes; then :
13	cat >>confdefs.h <<_ACEOF
14	#define HAVE_POSTGRESQL_LIBPQ_FE_H 1
15	_ACEOF
16	- PGHEADER=postgresql/libpq-fe.h
17	+ PGHEADER=libpq-fe.h
18	fi
19
20	done