Attachment #94430 for bug #132585

Lines 6-12 Link Here

(-)/usr/ports/textproc/wbxml2/Makefile (-1 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= wbxml2	8	PORTNAME= wbxml2
9	PORTVERSION= 0.10.0	9	PORTVERSION= 0.10.4
10	CATEGORIES= textproc devel	10	CATEGORIES= textproc devel
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	MASTER_SITE_SUBDIR= libwbxml	12	MASTER_SITE_SUBDIR= libwbxml
Lines 24-29 Link Here
24	CMAKE_SOURCE_PATH=..	24	CMAKE_SOURCE_PATH=..
25	PATCH_WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}	25	PATCH_WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}
26		26
		27	.if defined(NOPORTDOCS)
		28	EXTRA_PATCHES= ${FILESDIR}/noportdocs-CMakeLists.txt.diff
		29	.endif
		30
27	pre-patch:	31	pre-patch:
28	@cd ${PATCH_WRKSRC}	32	@cd ${PATCH_WRKSRC}
29		33

Lines 1-3 Link Here

(-)/usr/ports/textproc/wbxml2/distinfo (-3 / +3 lines)
1	MD5 (libwbxml-0.10.0.tar.bz2) = faaa28938e22ba839ca5eafbdaa1543b	1	MD5 (libwbxml-0.10.4.tar.bz2) = ca010b6748e6ce966157b078529fa3e1
2	SHA256 (libwbxml-0.10.0.tar.bz2) = 35cee44dcec64dce0672aa412df174f6e794445a708d7179be683cb37a2a103e	2	SHA256 (libwbxml-0.10.4.tar.bz2) = f271b74ad7df052c00225ef213634564b5fff67888b30f9e858336c7912c374e
3	SIZE (libwbxml-0.10.0.tar.bz2) = 314569	3	SIZE (libwbxml-0.10.4.tar.bz2) = 344334




--- CMakeLists.txt.orig	2009-03-12 15:07:17.000000000 +0000
+++ CMakeLists.txt	2009-03-12 15:08:53.000000000 +0000
@@ -158,7 +158,7 @@
 #	ADD_CUSTOM_TARGET( DoxygenDoc )
 #	ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools )
 #ENDIF ( BUILD_DOCUMENTATION )
-OPTION( ENABLE_INSTALL_DOC "install documentation" ON )
+OPTION( ENABLE_INSTALL_DOC "install documentation" OFF )
 IF( ENABLE_INSTALL_DOC )
 	ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/AUTHORS )
 	ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS )





--- CMakeLists.txt.orig	2009-03-12 09:25:18.000000000 +0000
+++ CMakeLists.txt	2009-03-12 09:26:03.000000000 +0000
@@ -174,7 +174,8 @@
 ENDIF( ENABLE_INSTALL_DOC )
 
 # todo: add requires in pc file
-INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${LIBDATA_INSTALL_DIR}/pkgconfig/" )
+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" )
+
 # status output
 INCLUDE( ShowStatus )
 MESSAGE( STATUS "==================================================" )




include/wbxml_config.h
lib/libwbxml2.so
lib/libwbxml2.so.0
lib/libwbxml2.so.0.0.14
libdata/pkgconfig/libwbxml2.pc
%%PORTDOCS%%share/doc/libwbxml/AUTHORS
%%PORTDOCS%%share/doc/libwbxml/BUGS
%%PORTDOCS%%share/doc/libwbxml/COPYING
%%PORTDOCS%%share/doc/libwbxml/ChangeLog
%%PORTDOCS%%share/doc/libwbxml/GNU-LGPL
%%PORTDOCS%%share/doc/libwbxml/INSTALL
%%PORTDOCS%%share/doc/libwbxml/NEWS
%%PORTDOCS%%share/doc/libwbxml/README
%%PORTDOCS%%share/doc/libwbxml/References
%%PORTDOCS%%share/doc/libwbxml/THANKS
%%PORTDOCS%%share/doc/libwbxml/TODO
%%PORTDOCS%%@dirrm share/doc/libwbxml

Return to bug 132585

Line 0 Link Here

(-)/usr/ports/textproc/wbxml2/files/noportdocs-CMakeLists.txt.diff (+12 lines)
	1	--- CMakeLists.txt.orig 2009-03-12 15:07:17.000000000 +0000
	2	+++ CMakeLists.txt 2009-03-12 15:08:53.000000000 +0000
	3	@@ -158,7 +158,7 @@
	4	# ADD_CUSTOM_TARGET( DoxygenDoc )
	5	# ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools )
	6	#ENDIF ( BUILD_DOCUMENTATION )
	7	-OPTION( ENABLE_INSTALL_DOC "install documentation" ON )
	8	+OPTION( ENABLE_INSTALL_DOC "install documentation" OFF )
	9	IF( ENABLE_INSTALL_DOC )
	10	ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/AUTHORS )
	11	ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS )
	12

Lines 1-11 Link Here

(-)/usr/ports/textproc/wbxml2/files/patch-CMakeLists.txt (-6 / +7 lines)
1	--- CMakeLists.txt 2008-12-05 16:06:35.000000000 +0200	1	--- CMakeLists.txt.orig 2009-03-12 09:25:18.000000000 +0000
2	+++ CMakeLists.txt 2008-12-06 15:09:44.000000000 +0200	2	+++ CMakeLists.txt 2009-03-12 09:26:03.000000000 +0000
3	@@ -152,7 +152,7 @@	3	@@ -174,7 +174,8 @@
4	ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/TODO )	4	ENDIF( ENABLE_INSTALL_DOC )
5		5
6	# todo: add requires in pc file	6	# todo: add requires in pc file
7	-INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig/" )	7	-INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${LIBDATA_INSTALL_DIR}/pkgconfig/" )
8	+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" )	8	+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" )
9		9	+
10	# status output	10	# status output
11	INCLUDE( ShowStatus )	11	INCLUDE( ShowStatus )
		12	MESSAGE( STATUS "==================================================" )

Lines 20-36 Link Here

(-)/usr/ports/textproc/wbxml2/pkg-plist (-13 / +13 lines)
20	include/wbxml_config.h	20	include/wbxml_config.h
21	lib/libwbxml2.so	21	lib/libwbxml2.so
22	lib/libwbxml2.so.0	22	lib/libwbxml2.so.0
23	lib/libwbxml2.so.0.0.10	23	lib/libwbxml2.so.0.0.14
24	libdata/pkgconfig/libwbxml2.pc	24	libdata/pkgconfig/libwbxml2.pc
25	share/doc/libwbxml/AUTHORS	25	%%PORTDOCS%%share/doc/libwbxml/AUTHORS
26	share/doc/libwbxml/BUGS	26	%%PORTDOCS%%share/doc/libwbxml/BUGS
27	share/doc/libwbxml/COPYING	27	%%PORTDOCS%%share/doc/libwbxml/COPYING
28	share/doc/libwbxml/ChangeLog	28	%%PORTDOCS%%share/doc/libwbxml/ChangeLog
29	share/doc/libwbxml/GNU-LGPL	29	%%PORTDOCS%%share/doc/libwbxml/GNU-LGPL
30	share/doc/libwbxml/INSTALL	30	%%PORTDOCS%%share/doc/libwbxml/INSTALL
31	share/doc/libwbxml/NEWS	31	%%PORTDOCS%%share/doc/libwbxml/NEWS
32	share/doc/libwbxml/README	32	%%PORTDOCS%%share/doc/libwbxml/README
33	share/doc/libwbxml/References	33	%%PORTDOCS%%share/doc/libwbxml/References
34	share/doc/libwbxml/THANKS	34	%%PORTDOCS%%share/doc/libwbxml/THANKS
35	share/doc/libwbxml/TODO	35	%%PORTDOCS%%share/doc/libwbxml/TODO
36	@dirrm share/doc/libwbxml	36	%%PORTDOCS%%@dirrm share/doc/libwbxml