Attachment #28993 for bug #48549

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




# $FreeBSD: ports/www/tidy-devel/Makefile,v 1.27 2003/02/19 00:43:41 leeym Exp $
#

PORTNAME?=	tidy
PORTVERSION=	030220
CATEGORIES=	www
MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
		http://tidy.sourceforge.net/docs/
MASTER_SITE_SUBDIR=	. old
PKGNAMESUFFIX?=	-devel
DISTNAME=	tidy_src
EXTRACT_SUFX=	.tgz
DISTFILES=	${DISTNAME}_${PORTVERSION}${EXTRACT_SUFX}

MAINTAINER?=	thierry@pompo.net
COMMENT?=	Utility to clean up and pretty print HTML/XHTML/XML

WRKSRC=		${WRKDIR}/${PORTNAME}

.if !defined(WITH_SHLIB)
USE_GMAKE=	yes
PLIST_SUB=	SHLIB="@comment "
.else
USE_AUTOMAKE_VER=	15
AUTOMAKE_ARGS+=	-a -c --foreign
USE_AUTOCONF=	yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
USE_LIBTOOL=	yes
INSTALLS_SHLIB=	yes
PLIST_SUB=	SHLIB=""
.endif

DESCR=		${.CURDIR}/pkg-descr

BIN2STRIP=	tidy tab2space

#MAN1=		tidy.1


APIEXT=		css html js png
.endif

post-patch:
.if !defined(WITH_SHLIB)
	@${CP} ${WRKSRC}/build/gmake/Makefile ${WRKSRC}
.else
	@${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
	(cd ${WRKSRC}	\
	&& ${LOCALBASE}/bin/libtoolize --force --copy	\
	&& ${ACLOCAL})
.endif

pre-install:
	@if [ -f ${LOCALBASE}/bin/tidy ]; then \
		${ECHO_MSG} "" ; \
		${ECHO_MSG} "Conflict: another tidy has been found; please deinstall it." ; \
		${ECHO_MSG} "(`pkg_info -W ${LOCALBASE}/bin/tidy`)" ; \
		${ECHO_MSG} "" ; \
		${FALSE} ; \
	fi

.for pgm in ${BIN2STRIP}
	@${STRIP_CMD} ${PREFIX}/bin/${pgm}
.endfor
.if defined(WITH_SHLIB)
	@${STRIP_CMD} ${PREFIX}/lib/libtidy-0.99.so.0
.endif
.if !defined(NOPORTDOCS)
	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
	@${MKDIR} ${DOCSDIR}

Lines 1-2 Link Here

(-)www/tidy-devel/distinfo (-1 / +1 lines)
1	MD5 (tidy_src_030217.tgz) = df447cc6b32c49577fd2aee7f88176db	1	MD5 (tidy_src_030220.tgz) = 1386d1a54e4429d4ddbb5a8bb01b5bc7
2	MD5 (tidy_docs_030216.tgz) = b832e6a78836bf31b3eadca3d5301106	2	MD5 (tidy_docs_030216.tgz) = b832e6a78836bf31b3eadca3d5301106




--- Makefile.orig	Tue Feb 18 08:57:03 2003
+++ Makefile	Tue Feb 18 21:59:51 2003
@@ -58,8 +58,8 @@
 PROJECT=tidy
 
 # Installation variables.  Spaces OK, only dir create and file copy operations.
-runinst_prefix=/usr/local
-devinst_prefix=/usr/local
+runinst_prefix=${PREFIX}
+devinst_prefix=${PREFIX}
 
 bininst = ${runinst_prefix}/bin
 libinst = ${devinst_prefix}/lib
@@ -67,7 +67,7 @@
 maninst = ${devinst_prefix}/man
 
 # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
-TOPDIR = ../..
+TOPDIR = .
 INCDIR = ${TOPDIR}/include
 APPDIR = ${TOPDIR}/console
 SRCDIR = ${TOPDIR}/src
@@ -76,10 +76,11 @@
 BINDIR = ${TOPDIR}/bin
 
 # CFLAGS etc..
-CC= gcc
-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
+#CC= gcc
+#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
+CFLAGS+= -I $(INCDIR)
 
-# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
+OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
 ifdef SUPPORT_UTF16_ENCODINGS
 CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
 endif




--- build/gmake/Makefile.orig	Tue Feb 18 08:57:03 2003
+++ build/gmake/Makefile	Wed Feb 19 22:17:12 2003
@@ -58,8 +58,8 @@
 PROJECT=tidy
 
 # Installation variables.  Spaces OK, only dir create and file copy operations.
-runinst_prefix=/usr/local
-devinst_prefix=/usr/local
+runinst_prefix=${PREFIX}
+devinst_prefix=${PREFIX}
 
 bininst = ${runinst_prefix}/bin
 libinst = ${devinst_prefix}/lib
@@ -67,7 +67,7 @@
 maninst = ${devinst_prefix}/man
 
 # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
-TOPDIR = ../..
+TOPDIR = .
 INCDIR = ${TOPDIR}/include
 APPDIR = ${TOPDIR}/console
 SRCDIR = ${TOPDIR}/src
@@ -76,10 +76,11 @@
 BINDIR = ${TOPDIR}/bin
 
 # CFLAGS etc..
-CC= gcc
-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
+#CC= gcc
+#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
+CFLAGS+= -I $(INCDIR)
 
-# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
+OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
 ifdef SUPPORT_UTF16_ENCODINGS
 CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
 endif

Line 0 Link Here

(-)www/tidy-devel/files/patch-build_gnuauto_configure.in (+11 lines)
	1	--- build/gnuauto/configure.in.orig Sat Jan 18 15:23:43 2003
	2	+++ build/gnuauto/configure.in Thu Feb 20 23:05:17 2003
	3	@@ -58,7 +58,7 @@
	4	if test $debug_build = yes; then
	5	CFLAGS="$save_cflags -g"
	6	else
	7	- CFLAGS="$save_cflags -O2"
	8	+ CFLAGS="$save_cflags"
	9	fi
	10	#
	11	# =============================================




--- build/gnuauto/include/Makefile.am.orig	Sat Jan 18 15:23:43 2003
+++ build/gnuauto/include/Makefile.am	Thu Feb 20 23:42:21 2003
@@ -53,8 +53,8 @@
 #  acknowledgment is not required but would be appreciated.
 #
 
-#tidyincdir = $(includedir)/tidy
-tidyincdir = $(includedir)
+tidyincdir = $(includedir)/tidy
+#tidyincdir = $(includedir)
 
 tidyinc_HEADERS = \
 	platform.h \

Line 0 Link Here

(-)www/tidy-devel/files/patch-build_gnuauto_src_Makefile.am (+11 lines)
	1	--- build/gnuauto/src/Makefile.am.orig Sun Feb 16 20:33:04 2003
	2	+++ build/gnuauto/src/Makefile.am Thu Feb 20 23:13:11 2003
	3	@@ -68,7 +68,7 @@
	4	tidylib.c
	5
	6	libtidy_la_LDFLAGS = \
	7	- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_LITE_AGE) \
	8	+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
	9	-release $(LT_RELEASE) -no-undefined -export-dynamic
	10
	11	HFILES = \

Lines 6-11 Link Here

(-)www/tidy-devel/pkg-plist (+2 lines)
6	include/tidy/platform.h	6	include/tidy/platform.h
7	include/tidy/tidy.h	7	include/tidy/tidy.h
8	include/tidy/tidyenum.h	8	include/tidy/tidyenum.h
		9	%%SHLIB%%lib/libtidy-0.99.so.0
		10	%%SHLIB%%lib/libtidy.so
9	lib/libtidy.a	11	lib/libtidy.a
10	%%PORTDOCS%%share/doc/tidy/Overview.html	12	%%PORTDOCS%%share/doc/tidy/Overview.html
11	%%PORTDOCS%%share/doc/tidy/faq.html	13	%%PORTDOCS%%share/doc/tidy/faq.html

Return to bug 48549

Lines 5-27 Link Here

(-)www/tidy-devel/Makefile (-10 / +34 lines)
5	# $FreeBSD: ports/www/tidy-devel/Makefile,v 1.27 2003/02/19 00:43:41 leeym Exp $	5	# $FreeBSD: ports/www/tidy-devel/Makefile,v 1.27 2003/02/19 00:43:41 leeym Exp $
6	#	6	#
7		7
8	PORTNAME= tidy	8	PORTNAME?= tidy
9	PORTVERSION= 030217	9	PORTVERSION= 030220
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \	11	MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \
12	http://tidy.sourceforge.net/docs/	12	http://tidy.sourceforge.net/docs/
13	MASTER_SITE_SUBDIR= . old	13	MASTER_SITE_SUBDIR= . old
14	PKGNAMESUFFIX= -devel	14	PKGNAMESUFFIX?= -devel
15	DISTNAME= tidy_src	15	DISTNAME= tidy_src
16	EXTRACT_SUFX= .tgz	16	EXTRACT_SUFX= .tgz
17	DISTFILES= ${DISTNAME}_${PORTVERSION}${EXTRACT_SUFX}	17	DISTFILES= ${DISTNAME}_${PORTVERSION}${EXTRACT_SUFX}
18		18
19	MAINTAINER= thierry@pompo.net	19	MAINTAINER?= thierry@pompo.net
20	COMMENT= Utility to clean up and pretty print HTML/XHTML/XML	20	COMMENT?= Utility to clean up and pretty print HTML/XHTML/XML
21		21
22	WRKSRC= ${WRKDIR}/${PORTNAME}	22	WRKSRC= ${WRKDIR}/${PORTNAME}
23		23
		24	.if !defined(WITH_SHLIB)
24	USE_GMAKE= yes	25	USE_GMAKE= yes
		26	PLIST_SUB= SHLIB="@comment "
		27	.else
		28	USE_AUTOMAKE_VER= 15
		29	AUTOMAKE_ARGS+= -a -c --foreign
		30	USE_AUTOCONF= yes
		31	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
		32	USE_LIBTOOL= yes
		33	INSTALLS_SHLIB= yes
		34	PLIST_SUB= SHLIB=""
		35	.endif
		36
		37	DESCR= ${.CURDIR}/pkg-descr
		38
		39	BIN2STRIP= tidy tab2space
25		40
26	#MAN1= tidy.1	41	#MAN1= tidy.1
27		42
Lines 33-47 Link Here
33	APIEXT= css html js png	48	APIEXT= css html js png
34	.endif	49	.endif
35		50
36	BIN2STRIP= tidy tab2space	51	post-patch:
37		52	.if !defined(WITH_SHLIB)
38	post-extract:	53	@${CP} ${WRKSRC}/build/gmake/Makefile ${WRKSRC}
39	@${CP} -p ${WRKSRC}/build/gmake/Makefile ${WRKSRC}	54	.else
		55	@${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
		56	(cd ${WRKSRC} \
		57	&& ${LOCALBASE}/bin/libtoolize --force --copy \
		58	&& ${ACLOCAL})
		59	.endif
40		60
41	pre-install:	61	pre-install:
42	@if [ -f ${LOCALBASE}/bin/tidy ]; then \	62	@if [ -f ${LOCALBASE}/bin/tidy ]; then \
43	${ECHO_MSG} "" ; \	63	${ECHO_MSG} "" ; \
44	${ECHO_MSG} "Conflict: please deinstall the port bin/tidy." ; \	64	${ECHO_MSG} "Conflict: another tidy has been found; please deinstall it." ; \
		65	${ECHO_MSG} "(`pkg_info -W ${LOCALBASE}/bin/tidy`)" ; \
45	${ECHO_MSG} "" ; \	66	${ECHO_MSG} "" ; \
46	${FALSE} ; \	67	${FALSE} ; \
47	fi	68	fi
Lines 50-55 Link Here
50	.for pgm in ${BIN2STRIP}	71	.for pgm in ${BIN2STRIP}
51	@${STRIP_CMD} ${PREFIX}/bin/${pgm}	72	@${STRIP_CMD} ${PREFIX}/bin/${pgm}
52	.endfor	73	.endfor
		74	.if defined(WITH_SHLIB)
		75	@${STRIP_CMD} ${PREFIX}/lib/libtidy-0.99.so.0
		76	.endif
53	.if !defined(NOPORTDOCS)	77	.if !defined(NOPORTDOCS)
54	@${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"	78	@${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
55	@${MKDIR} ${DOCSDIR}	79	@${MKDIR} ${DOCSDIR}

Lines 1-37 Link Here

(-)www/tidy-devel/files/patch-Makefile (-37 lines)
1	--- Makefile.orig Tue Feb 18 08:57:03 2003
2	+++ Makefile Tue Feb 18 21:59:51 2003
3	@@ -58,8 +58,8 @@
4	PROJECT=tidy
5
6	# Installation variables. Spaces OK, only dir create and file copy operations.
7	-runinst_prefix=/usr/local
8	-devinst_prefix=/usr/local
9	+runinst_prefix=${PREFIX}
10	+devinst_prefix=${PREFIX}
11
12	bininst = ${runinst_prefix}/bin
13	libinst = ${devinst_prefix}/lib
14	@@ -67,7 +67,7 @@
15	maninst = ${devinst_prefix}/man
16
17	# Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
18	-TOPDIR = ../..
19	+TOPDIR = .
20	INCDIR = ${TOPDIR}/include
21	APPDIR = ${TOPDIR}/console
22	SRCDIR = ${TOPDIR}/src
23	@@ -76,10 +76,11 @@
24	BINDIR = ${TOPDIR}/bin
25
26	# CFLAGS etc..
27	-CC= gcc
28	-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
29	+#CC= gcc
30	+#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
31	+CFLAGS+= -I $(INCDIR)
32
33	-# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
34	+OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
35	ifdef SUPPORT_UTF16_ENCODINGS
36	CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
37	endif

Line 0 Link Here

(-)www/tidy-devel/files/patch-build_gmake_Makefile (+37 lines)
	1	--- build/gmake/Makefile.orig Tue Feb 18 08:57:03 2003
	2	+++ build/gmake/Makefile Wed Feb 19 22:17:12 2003
	3	@@ -58,8 +58,8 @@
	4	PROJECT=tidy
	5
	6	# Installation variables. Spaces OK, only dir create and file copy operations.
	7	-runinst_prefix=/usr/local
	8	-devinst_prefix=/usr/local
	9	+runinst_prefix=${PREFIX}
	10	+devinst_prefix=${PREFIX}
	11
	12	bininst = ${runinst_prefix}/bin
	13	libinst = ${devinst_prefix}/lib
	14	@@ -67,7 +67,7 @@
	15	maninst = ${devinst_prefix}/man
	16
	17	# Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
	18	-TOPDIR = ../..
	19	+TOPDIR = .
	20	INCDIR = ${TOPDIR}/include
	21	APPDIR = ${TOPDIR}/console
	22	SRCDIR = ${TOPDIR}/src
	23	@@ -76,10 +76,11 @@
	24	BINDIR = ${TOPDIR}/bin
	25
	26	# CFLAGS etc..
	27	-CC= gcc
	28	-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
	29	+#CC= gcc
	30	+#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
	31	+CFLAGS+= -I $(INCDIR)
	32
	33	-# OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
	34	+OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
	35	ifdef SUPPORT_UTF16_ENCODINGS
	36	CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
	37	endif

Line 0 Link Here

(-)www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am (+13 lines)
	1	--- build/gnuauto/include/Makefile.am.orig Sat Jan 18 15:23:43 2003
	2	+++ build/gnuauto/include/Makefile.am Thu Feb 20 23:42:21 2003
	3	@@ -53,8 +53,8 @@
	4	# acknowledgment is not required but would be appreciated.
	5	#
	6
	7	-#tidyincdir = $(includedir)/tidy
	8	-tidyincdir = $(includedir)
	9	+tidyincdir = $(includedir)/tidy
	10	+#tidyincdir = $(includedir)
	11
	12	tidyinc_HEADERS = \
	13	platform.h \