Attachment #37644 for bug #59842

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





PORTNAME=	lirc
PORTVERSION=	0.6.6
PORTREVISION=	1
CATEGORIES=	comms
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	lirc

MAINTAINER=	mikeh@FreeBSD.org
COMMENT=	Linux Infared Remote Control

LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt

USE_XLIB=	yes
USE_GETOPT_LONG=	yes
USE_GMAKE=	yes
USE_LIBTOOL=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-driver=any --disable-manage-devices

MAN1=		irexec.1 ircat.1 irpty.1 irrecord.1 irw.1 irxevent.1 \
		mode2.1 smode2.1 xmode2.1 rc.1




--- daemons/Makefile.in.orig	Sun Oct  6 05:24:53 2002
+++ daemons/Makefile.in	Sat Jan  4 21:28:01 2003
@@ -231,7 +231,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/config_file.Po \
 @AMDEP_TRUE@	$(DEPDIR)/dump_config.Po $(DEPDIR)/hw-types.Po \
@@ -265,7 +265,7 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
 DIST_SOURCES = $(irrecord_SOURCES) $(EXTRA_irrecord_SOURCES) \
 	$(lircd_SOURCES) $(EXTRA_lircd_SOURCES) $(lircd_simrec_SOURCES) \
 	$(lircd_simsend_SOURCES) $(lircmd_SOURCES) $(slinke_SOURCES)
--- tools/Makefile.in.orig	Sat Jan  4 22:02:21 2003
+++ tools/Makefile.in	Sat Jan  4 22:03:09 2003
@@ -192,7 +192,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ircat.Po $(DEPDIR)/irexec.Po \
 @AMDEP_TRUE@	$(DEPDIR)/irpty.Po $(DEPDIR)/irw.Po \
@@ -206,7 +206,7 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
 DIST_SOURCES = $(liblirc_client_la_SOURCES) $(ircat_SOURCES) \
 	$(irexec_SOURCES) $(irpty_SOURCES) $(irw_SOURCES) \
 	$(irxevent_SOURCES) $(mode2_SOURCES) $(rc_SOURCES) \




--- configure.orig	Sun Oct  6 18:22:41 2002
+++ configure	Sun Nov 30 23:26:58 2003
@@ -1495,8 +1495,6 @@
 
 		    		    		    ac_config_headers="$ac_config_headers config.h"
 
-CFLAGS="-O2 -g -Wall"
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6753,6 +6751,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Lines 10-16 Link Here

(-)comms/lirc/pkg-plist (-1 lines)
10	include/lirc/lirc_client.h	10	include/lirc/lirc_client.h
11	@dirrm include/lirc	11	@dirrm include/lirc
12	lib/liblirc_client.a	12	lib/liblirc_client.a
13	lib/liblirc_client.la
14	lib/liblirc_client.so	13	lib/liblirc_client.so
15	lib/liblirc_client.so.0	14	lib/liblirc_client.so.0
16	sbin/lircd	15	sbin/lircd

Return to bug 59842

Lines 7-12 Link Here

(-)comms/lirc/Makefile (-4 / +5 lines)
7		7
8	PORTNAME= lirc	8	PORTNAME= lirc
9	PORTVERSION= 0.6.6	9	PORTVERSION= 0.6.6
		10	PORTREVISION= 1
10	CATEGORIES= comms	11	CATEGORIES= comms
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= lirc	13	MASTER_SITE_SUBDIR= lirc
Lines 14-25 Link Here
14	MAINTAINER= mikeh@FreeBSD.org	15	MAINTAINER= mikeh@FreeBSD.org
15	COMMENT= Linux Infared Remote Control	16	COMMENT= Linux Infared Remote Control
16		17
17	LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
18
19	USE_XLIB= yes	18	USE_XLIB= yes
		19	USE_GETOPT_LONG= yes
20	USE_GMAKE= yes	20	USE_GMAKE= yes
21	GNU_CONFIGURE= yes	21	USE_LIBTOOL= yes
22	CONFIGURE_ARGS+=--with-driver=any --disable-manage-devices	22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		23	CONFIGURE_ARGS= --with-driver=any --disable-manage-devices
23		24
24	MAN1= irexec.1 ircat.1 irpty.1 irrecord.1 irw.1 irxevent.1 \	25	MAN1= irexec.1 ircat.1 irpty.1 irrecord.1 irw.1 irxevent.1 \
25	mode2.1 smode2.1 xmode2.1 rc.1	26	mode2.1 smode2.1 xmode2.1 rc.1

Lines 1-40 Link Here

(-)comms/lirc/files/patch-ab (-40 lines)
1	--- daemons/Makefile.in.orig Sun Oct 6 05:24:53 2002
2	+++ daemons/Makefile.in Sat Jan 4 21:28:01 2003
3	@@ -231,7 +231,7 @@
4	DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
5	CPPFLAGS = @CPPFLAGS@
6	LDFLAGS = @LDFLAGS@
7	-LIBS = @LIBS@
8	+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
9	depcomp = $(SHELL) $(top_srcdir)/depcomp
10	@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/config_file.Po \
11	@AMDEP_TRUE@ $(DEPDIR)/dump_config.Po $(DEPDIR)/hw-types.Po \
12	@@ -265,7 +265,7 @@
13	CCLD = $(CC)
14	LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
15	$(AM_LDFLAGS) $(LDFLAGS) -o $@
16	-CFLAGS = @CFLAGS@
17	+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
18	DIST_SOURCES = $(irrecord_SOURCES) $(EXTRA_irrecord_SOURCES) \
19	$(lircd_SOURCES) $(EXTRA_lircd_SOURCES) $(lircd_simrec_SOURCES) \
20	$(lircd_simsend_SOURCES) $(lircmd_SOURCES) $(slinke_SOURCES)
21	--- tools/Makefile.in.orig Sat Jan 4 22:02:21 2003
22	+++ tools/Makefile.in Sat Jan 4 22:03:09 2003
23	@@ -192,7 +192,7 @@
24	DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
25	CPPFLAGS = @CPPFLAGS@
26	LDFLAGS = @LDFLAGS@
27	-LIBS = @LIBS@
28	+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
29	depcomp = $(SHELL) $(top_srcdir)/depcomp
30	@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ircat.Po $(DEPDIR)/irexec.Po \
31	@AMDEP_TRUE@ $(DEPDIR)/irpty.Po $(DEPDIR)/irw.Po \
32	@@ -206,7 +206,7 @@
33	CCLD = $(CC)
34	LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
35	$(AM_LDFLAGS) $(LDFLAGS) -o $@
36	-CFLAGS = @CFLAGS@
37	+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
38	DIST_SOURCES = $(liblirc_client_la_SOURCES) $(ircat_SOURCES) \
39	$(irexec_SOURCES) $(irpty_SOURCES) $(irw_SOURCES) \
40	$(irxevent_SOURCES) $(mode2_SOURCES) $(rc_SOURCES) \

Line 0 Link Here

(-)comms/lirc/files/patch-configure (+19 lines)
	1	--- configure.orig Sun Oct 6 18:22:41 2002
	2	+++ configure Sun Nov 30 23:26:58 2003
	3	@@ -1495,8 +1495,6 @@
	4
	5	ac_config_headers="$ac_config_headers config.h"
	6
	7	-CFLAGS="-O2 -g -Wall"
	8	-
	9	ac_ext=c
	10	ac_cpp='$CPP $CPPFLAGS'
	11	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	12	@@ -6753,6 +6751,7 @@
	13
	14	# This can be used to rebuild libtool when needed
	15	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	16	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	17
	18	# Always use our own libtool.
	19	LIBTOOL='$(SHELL) $(top_builddir)/libtool'