diff options
| author | netchild <netchild@FreeBSD.org> | 2006-02-15 05:19:43 +0800 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2006-02-15 05:19:43 +0800 |
| commit | a1a0987748a07e937a0a675da8a69f3610a0334d (patch) | |
| tree | d858c6ff211b36da0f0d57e5c312fb15400144af | |
| parent | 03fc18b12863d8aad330a5fcc294477686b716e5 (diff) | |
| download | freebsd-ports-gnome-a1a0987748a07e937a0a675da8a69f3610a0334d.tar.gz freebsd-ports-gnome-a1a0987748a07e937a0a675da8a69f3610a0334d.tar.zst freebsd-ports-gnome-a1a0987748a07e937a0a675da8a69f3610a0334d.zip | |
- fix build on 64bit machines ("-fPIC"-dance) [1]
- don't change the name of the lib depending on the hw-architecture [2]
- assign a maintainer [2]
Submitted by: Steve Ames <steve@energistic.com> [2]
Tested by: erwin (on amd64) [1]
| -rw-r--r-- | devel/pwlib/Makefile | 11 | ||||
| -rw-r--r-- | devel/pwlib/files/patch-unixmak | 34 | ||||
| -rw-r--r-- | devel/pwlib/pkg-plist | 8 |
3 files changed, 44 insertions, 9 deletions
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index a49de807aa43..dabfaaf78e06 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -8,11 +8,12 @@ PORTNAME= pwlib PORTVERSION= 1.9.2 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.voxgratia.org/releases/ DISTFILES= pwlib-v1_9_2-src-tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= steve@energistic.com COMMENT= A cross platform C++ library, used by OpenH323 LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 @@ -59,11 +60,11 @@ CONFIGURE_ARGS+= --disable-openldap USE_OPENLDAP= yes .endif +.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") +CFLAGS+= -fPIC +.endif + CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" SDLLIBDIR="${LOCALBASE}/lib" MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" SDLLIBDIR="${LOCALBASE}/lib" STDCCFLAGS+="-I${LOCALBASE}" -#.if ${OSVERSION} < 502101 -#ONLY_FOR_ARCHS= i386 -#.endif - .include <bsd.port.post.mk> diff --git a/devel/pwlib/files/patch-unixmak b/devel/pwlib/files/patch-unixmak new file mode 100644 index 000000000000..30966d7e234a --- /dev/null +++ b/devel/pwlib/files/patch-unixmak @@ -0,0 +1,34 @@ +--- make/unix.mak.orig Tue Jan 17 13:57:17 2006 ++++ make/unix.mak Tue Feb 14 15:12:55 2006 +@@ -871,9 +871,9 @@ + endif + + ifndef PTLIB_ALT +-PLATFORM_TYPE = $(OSTYPE)_$(MACHTYPE) ++PLATFORM_TYPE = + else +-PLATFORM_TYPE = $(OSTYPE)_$(PTLIB_ALT)_$(MACHTYPE) ++PLATFORM_TYPE = + endif + + ifndef OBJ_SUFFIX +@@ -939,15 +939,15 @@ + PW_LIBDIR = $(PWLIBDIR)/lib + + # set name of the PT library +-PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) ++PTLIB_BASE = pt_$(OBJ_SUFFIX) + PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) +-PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX) ++PT_OBJBASE = obj_$(OBJDIR_SUFFIX) + PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE) + + # set name of the PW library (may not be used) +-PWLIB_BASE = pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) ++PWLIB_BASE = pw_$(GUI_TYPE)_$(OBJ_SUFFIX) + PWLIB_FILE = lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) +-PW_OBJBASE = obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX) ++PW_OBJBASE = obj_$(GUI_TYPE)_$(OBJDIR_SUFFIX) + PW_OBJDIR = $(PW_LIBDIR)/$(PW_OBJBASE) + + ############################################################################### diff --git a/devel/pwlib/pkg-plist b/devel/pwlib/pkg-plist index 9dc43c630b91..57976081e5c0 100644 --- a/devel/pwlib/pkg-plist +++ b/devel/pwlib/pkg-plist @@ -153,10 +153,10 @@ include/ptlib/videoio.h include/ptlib/videoio1394dc.h @dirrm include/ptlib lib/libpt.so -lib/libpt_FreeBSD_x86_r.so -lib/libpt_FreeBSD_x86_r.so.1 -lib/libpt_FreeBSD_x86_r.so.1.9 -lib/libpt_FreeBSD_x86_r.so.1.9.2 +lib/libpt_r.so +lib/libpt_r.so.1 +lib/libpt_r.so.1.9 +lib/libpt_r.so.1.9.2 lib/pwlib/devices/sound/oss_pwplugin.so lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so @dirrm lib/pwlib/devices/sound |