Attachment #122762 for bug #166024

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




#

PORTNAME=	rudiments
PORTVERSION=	0.35
CATEGORIES=	devel
MASTER_SITES=	SF

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A utility C++ class library for daemons, clients, servers and more

LICENSE=	LGPL20

USE_GNOME=	pkgconfig
USE_OPENSSL=	yes
USE_GMAKE=	yes

		--with-ssl-libs=-L${OPENSSLLIB} \
		--disable-pcre
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

MAN1=		rudiments-config.1

ROOTDIRS=	classes css programming programming/parts

post-patch:
	@${REINPLACE_CMD} -e \
		'/pkgconfig/s|$$(libdir)/|$$(prefix)/libdata/| ; \
		 /^install:/s| install-doc | |' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e \
		's|^#!/usr/bin/perl|#!${PERL}|' ${WRKSRC}/doc/programming/insert.pl
	@${REINPLACE_CMD} -e \
		's| -release $$(RUDIMENTS_VERSION)||' ${WRKSRC}/src/Makefile

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@(${TAR} -C ${WRKSRC}/doc --exclude CVS --exclude "Makefile" \
		--exclude "*.bak" --exclude "*.in" -cf - . | \
		${TAR} -C ${DOCSDIR} --unlink -xf -)
	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
	@${FIND} ${DOCSDIR} -type d | ${XARGS} ${CHMOD} a+rx
	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
		${DOCSDIR}/css
	@${INSTALL_DATA} ${WRKSRC}/doc/programming/*.html \
		${DOCSDIR}/programming
	@${INSTALL_SCRIPT} ${WRKSRC}/doc/programming/*.pl \
		${DOCSDIR}/programming
	@${INSTALL_DATA} ${WRKSRC}/doc/programming/parts/*.html \
		${DOCSDIR}/programming/parts
	@${INSTALL_DATA} ${WRKSRC}/doc/*.html \
		${DOCSDIR}
	@${INSTALL_DATA} ${WRKSRC}/doc/*.gif \
		${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/rudiments/distinfo (-2 / +2 lines)
1	SHA256 (rudiments-0.34.tar.gz) = a0e43bc961a7bbba08560393311076e0293627908de487302db454b273c159df	1	SHA256 (rudiments-0.35.tar.gz) = ccf177734314c7a01a0fb22786bb0aafc9887a7127f78d9698fedf0a493baa30
2	SIZE (rudiments-0.34.tar.gz) = 770725	2	SIZE (rudiments-0.35.tar.gz) = 770791




--- Makefile.orig	2011-04-22 05:20:05.000000000 +0200
+++ Makefile	2011-11-09 06:21:19.309527011 +0100
@@ -5,7 +5,7 @@
 PWD=$(shell pwd)
 
 .PHONY: all testprogs clean install-libs install-includes install-bin \
-	 install-doc install-man install-pc install uninstall unconfig distclean
+	 install-man install-pc install uninstall unconfig distclean
 
 all:
 	cd src; $(MAKE) all
@@ -27,23 +27,19 @@
 install-bin:
 	cd bin; $(MAKE) install
 
-install-doc:
-	cd doc; $(MAKE) install
-
 install-man:
 	cd man; $(MAKE) install
 
 install-pc:
-	$(MKINSTALLDIRS) $(libdir)/pkgconfig
-	$(INSTALL) -m 0644 rudiments.pc $(libdir)/pkgconfig/rudiments.pc
+	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
+	$(INSTALL) -m 0644 rudiments.pc $(prefix)/libdata/pkgconfig/rudiments.pc
 
-install: install-libs install-includes install-bin install-doc install-man install-pc
+install: install-libs install-includes install-bin install-man install-pc
 
 uninstall:
 	cd src; $(MAKE) uninstall
 	cd include; $(MAKE) uninstall
 	cd bin; $(MAKE) uninstall
-	cd doc; $(MAKE) uninstall
 	cd man; $(MAKE) uninstall
 	$(RM) $(libdir)/pkgconfig/rudiments.pc
 

Lines 1-6 Link Here

(-)devel/rudiments/files/patch-configure (-9 / +15 lines)
1	--- configure.orig Mon Aug 9 03:23:18 2004	1	--- configure.orig 2011-12-25 13:46:41.000000000 +0900
2	+++ configure Thu Aug 26 16:17:40 2004	2	+++ configure 2012-02-14 22:39:36.000000000 +0900
3	@@ -19632,8 +19632,8 @@	3	@@ -15737,8 +15737,8 @@
4	then	4	then
5		5
6	HAVE_PTHREAD=""	6	HAVE_PTHREAD=""
Lines 11-17 Link Here
11		11
12	if ( test "$cross_compiling" = "yes" )	12	if ( test "$cross_compiling" = "yes" )
13	then	13	then
14	@@ -19667,9 +19667,6 @@	14	@@ -15757,7 +15757,7 @@
		15
		16	else
		17
		18	- for i in "pthread" "c_r" "thread"
		19	+ for i in "thread"
		20	do
		21
		22
		23	@@ -15774,9 +15774,6 @@
15	STATIC=""	24	STATIC=""
16	HEADERSANDLIBSPATH=""	25	HEADERSANDLIBSPATH=""
17		26
Lines 21-29 Link Here
21	eval "PTHREADSTATIC=\"\""	30	eval "PTHREADSTATIC=\"\""
22	if ( test -n "" )	31	if ( test -n "" )
23	then	32	then
24	@@ -20293,9 +20290,6 @@	33	@@ -16244,9 +16241,6 @@
25	INCLUDESTRING=`echo $INCLUDESTRING \| sed -e "s\|-I/usr/include$\|\|g" -e "s\|-I/usr/include \|\|g"`
26	LIBSTRING=`echo $LIBSTRING \| sed -e "s\|-L/usr/lib$\|\|g" -e "s\|-L/lib$\|\|g" -e "s\|-L/usr/lib \|\|g" -e "s\|-L/lib \|\|g"`	34	LIBSTRING=`echo $LIBSTRING \| sed -e "s\|-L/usr/lib$\|\|g" -e "s\|-L/lib$\|\|g" -e "s\|-L/usr/lib \|\|g" -e "s\|-L/lib \|\|g"`
		35	LIBSTRING=`echo $LIBSTRING \| sed -e "s\|-L/usr/lib64$\|\|g" -e "s\|-L/lib64$\|\|g" -e "s\|-L/usr/lib64 \|\|g" -e "s\|-L/lib64 \|\|g"`
27		36
28	-eval "PTHREADINCLUDES=\"$INCLUDESTRING\""	37	-eval "PTHREADINCLUDES=\"$INCLUDESTRING\""
29	-eval "PTHREADLIB=\"$LIBSTRING\""	38	-eval "PTHREADLIB=\"$LIBSTRING\""
Lines 31-36 Link Here
31	eval "PTHREADSTATIC=\"$STATIC\""	40	eval "PTHREADSTATIC=\"$STATIC\""
32	if ( test -n "" )	41	if ( test -n "" )
33	then	42	then
34
35
36

Lines 1-11 Link Here

(-)devel/rudiments/files/patch-src-Makefile (-11 lines)
1	--- src/Makefile.orig 2011-07-29 12:54:42.000000000 +0200
2	+++ src/Makefile 2011-11-08 20:33:40.121527699 +0100
3	@@ -341,7 +341,7 @@
4	$(RMTREE) .libs
5
6	librudiments.la: $(SRCS) $(LOBJS)
7	- $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(DLLIB) -rpath $(libdir) -release $(RUDIMENTS_VERSION) -version-info $(SONAME_VERSION_INFO) -no-undefined
8	+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) $(LDFLAGS) $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(DLLIB) -rpath $(libdir) -version-info $(SONAME_VERSION_INFO) -no-undefined
9
10	install:
11	$(MKINSTALLDIRS) $(libdir)




include/rudiments/private/serversocketincludes.h
include/rudiments/private/serviceentry.h
include/rudiments/private/serviceentryincludes.h
include/rudiments/private/shadowentryincludes.h
include/rudiments/private/shadowentry.h
include/rudiments/private/shadowentryincludes.h
include/rudiments/private/sharedmemory.h
include/rudiments/private/sharedmemoryincludes.h
include/rudiments/private/shmfile.h

%%PORTDOCS%%%%DOCSDIR%%/invisible.gif
%%PORTDOCS%%%%DOCSDIR%%/programming/baseclasses.html
%%PORTDOCS%%%%DOCSDIR%%/programming/insert.pl
%%PORTDOCS%%%%DOCSDIR%%/programming/utilclasses.html
%%PORTDOCS%%%%DOCSDIR%%/programming/parts/character.C.html
%%PORTDOCS%%%%DOCSDIR%%/programming/parts/charstring.C.html
%%PORTDOCS%%%%DOCSDIR%%/programming/parts/chat.C.html

%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xattr.C.html
%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmld.C.html
%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmls.C.html
%%PORTDOCS%%%%DOCSDIR%%/programming/utilclasses.html
%%PORTDOCS%%%%DOCSDIR%%/reference.html
@dirrm include/rudiments/private
@dirrm include/rudiments
%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming/parts
%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming
%%PORTDOCS%%@dirrm %%DOCSDIR%%/css
%%PORTDOCS%%@dirrm %%DOCSDIR%%/classes
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/rudiments/private
@dirrm include/rudiments

Return to bug 166024

Lines 6-18 Link Here

(-)devel/rudiments/Makefile (-23 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= rudiments	8	PORTNAME= rudiments
9	PORTVERSION= 0.34	9	PORTVERSION= 0.35
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= A utility C++ class library for daemons, clients, servers and more	14	COMMENT= A utility C++ class library for daemons, clients, servers and more
15		15
		16	LICENSE= LGPL20
		17
16	USE_GNOME= pkgconfig	18	USE_GNOME= pkgconfig
17	USE_OPENSSL= yes	19	USE_OPENSSL= yes
18	USE_GMAKE= yes	20	USE_GMAKE= yes
Lines 23-56 Link Here
23	--with-ssl-libs=-L${OPENSSLLIB} \	25	--with-ssl-libs=-L${OPENSSLLIB} \
24	--disable-pcre	26	--disable-pcre
25	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
		28	MAKE_JOBS_SAFE= yes
26		29
27	MAN1= rudiments-config.1	30	MAN1= rudiments-config.1
28		31
29	ROOTDIRS= classes css programming programming/parts
30
31	post-patch:	32	post-patch:
32	${REINPLACE_CMD} -e 's,/usr/bin/perl,${PREFIX}/bin/perl,g' \	33	@${REINPLACE_CMD} -e \
33	${WRKSRC}/doc/programming/insert.pl	34	'/pkgconfig/s\|$$(libdir)/\|$$(prefix)/libdata/\| ; \
		35	/^install:/s\| install-doc \| \|' ${WRKSRC}/Makefile
		36	@${REINPLACE_CMD} -e \
		37	's\|^#!/usr/bin/perl\|#!${PERL}\|' ${WRKSRC}/doc/programming/insert.pl
		38	@${REINPLACE_CMD} -e \
		39	's\| -release $$(RUDIMENTS_VERSION)\|\|' ${WRKSRC}/src/Makefile
		40
34	post-install:	41	post-install:
35	.if !defined(NOPORTDOCS)	42	.if !defined(NOPORTDOCS)
36	${MKDIR} ${DOCSDIR}	43	@${MKDIR} ${DOCSDIR}
37	.for dirs in ${ROOTDIRS}	44	@(${TAR} -C ${WRKSRC}/doc --exclude CVS --exclude "Makefile" \
38	@${MKDIR} ${DOCSDIR}/${dirs}	45	--exclude ".bak" --exclude ".in" -cf - . \| \
39	.endfor	46	${TAR} -C ${DOCSDIR} --unlink -xf -)
40	@${INSTALL_DATA} ${WRKSRC}/doc/classes/*.html \	47	@${FIND} ${DOCSDIR} \| ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
41	${DOCSDIR}/classes	48	@${FIND} ${DOCSDIR} -type d \| ${XARGS} ${CHMOD} a+rx
42	@${INSTALL_DATA} ${WRKSRC}/doc/css/*.css \	49	@${FIND} ${DOCSDIR} -type f \| ${XARGS} ${CHMOD} ${SHAREMODE}
43	${DOCSDIR}/css
44	@${INSTALL_DATA} ${WRKSRC}/doc/programming/*.html \
45	${DOCSDIR}/programming
46	@${INSTALL_SCRIPT} ${WRKSRC}/doc/programming/*.pl \
47	${DOCSDIR}/programming
48	@${INSTALL_DATA} ${WRKSRC}/doc/programming/parts/*.html \
49	${DOCSDIR}/programming/parts
50	@${INSTALL_DATA} ${WRKSRC}/doc/*.html \
51	${DOCSDIR}
52	@${INSTALL_DATA} ${WRKSRC}/doc/*.gif \
53	${DOCSDIR}
54	.endif	50	.endif
55		51
56	.include <bsd.port.mk>	52	.include <bsd.port.mk>

Lines 1-38 Link Here

(-)devel/rudiments/files/patch-Makefile (-38 lines)
1	--- Makefile.orig 2011-04-22 05:20:05.000000000 +0200
2	+++ Makefile 2011-11-09 06:21:19.309527011 +0100
3	@@ -5,7 +5,7 @@
4	PWD=$(shell pwd)
5
6	.PHONY: all testprogs clean install-libs install-includes install-bin \
7	- install-doc install-man install-pc install uninstall unconfig distclean
8	+ install-man install-pc install uninstall unconfig distclean
9
10	all:
11	cd src; $(MAKE) all
12	@@ -27,23 +27,19 @@
13	install-bin:
14	cd bin; $(MAKE) install
15
16	-install-doc:
17	- cd doc; $(MAKE) install
18	-
19	install-man:
20	cd man; $(MAKE) install
21
22	install-pc:
23	- $(MKINSTALLDIRS) $(libdir)/pkgconfig
24	- $(INSTALL) -m 0644 rudiments.pc $(libdir)/pkgconfig/rudiments.pc
25	+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
26	+ $(INSTALL) -m 0644 rudiments.pc $(prefix)/libdata/pkgconfig/rudiments.pc
27
28	-install: install-libs install-includes install-bin install-doc install-man install-pc
29	+install: install-libs install-includes install-bin install-man install-pc
30
31	uninstall:
32	cd src; $(MAKE) uninstall
33	cd include; $(MAKE) uninstall
34	cd bin; $(MAKE) uninstall
35	- cd doc; $(MAKE) uninstall
36	cd man; $(MAKE) uninstall
37	$(RM) $(libdir)/pkgconfig/rudiments.pc
38

Lines 140-147 Link Here

(-)devel/rudiments/pkg-plist (-4 / +4 lines)
140	include/rudiments/private/serversocketincludes.h	140	include/rudiments/private/serversocketincludes.h
141	include/rudiments/private/serviceentry.h	141	include/rudiments/private/serviceentry.h
142	include/rudiments/private/serviceentryincludes.h	142	include/rudiments/private/serviceentryincludes.h
143	include/rudiments/private/shadowentryincludes.h
144	include/rudiments/private/shadowentry.h	143	include/rudiments/private/shadowentry.h
		144	include/rudiments/private/shadowentryincludes.h
145	include/rudiments/private/sharedmemory.h	145	include/rudiments/private/sharedmemory.h
146	include/rudiments/private/sharedmemoryincludes.h	146	include/rudiments/private/sharedmemoryincludes.h
147	include/rudiments/private/shmfile.h	147	include/rudiments/private/shmfile.h
Lines 287-292 Link Here
287	%%PORTDOCS%%%%DOCSDIR%%/invisible.gif	287	%%PORTDOCS%%%%DOCSDIR%%/invisible.gif
288	%%PORTDOCS%%%%DOCSDIR%%/programming/baseclasses.html	288	%%PORTDOCS%%%%DOCSDIR%%/programming/baseclasses.html
289	%%PORTDOCS%%%%DOCSDIR%%/programming/insert.pl	289	%%PORTDOCS%%%%DOCSDIR%%/programming/insert.pl
		290	%%PORTDOCS%%%%DOCSDIR%%/programming/utilclasses.html
290	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/character.C.html	291	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/character.C.html
291	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/charstring.C.html	292	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/charstring.C.html
292	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/chat.C.html	293	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/chat.C.html
Lines 356-367 Link Here
356	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xattr.C.html	357	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xattr.C.html
357	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmld.C.html	358	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmld.C.html
358	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmls.C.html	359	%%PORTDOCS%%%%DOCSDIR%%/programming/parts/xmls.C.html
359	%%PORTDOCS%%%%DOCSDIR%%/programming/utilclasses.html
360	%%PORTDOCS%%%%DOCSDIR%%/reference.html	360	%%PORTDOCS%%%%DOCSDIR%%/reference.html
361	@dirrm include/rudiments/private
362	@dirrm include/rudiments
363	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming/parts	361	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming/parts
364	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming	362	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming
365	%%PORTDOCS%%@dirrm %%DOCSDIR%%/css	363	%%PORTDOCS%%@dirrm %%DOCSDIR%%/css
366	%%PORTDOCS%%@dirrm %%DOCSDIR%%/classes	364	%%PORTDOCS%%@dirrm %%DOCSDIR%%/classes
367	%%PORTDOCS%%@dirrm %%DOCSDIR%%	365	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		366	@dirrm include/rudiments/private
		367	@dirrm include/rudiments